Merge "Work around focusSearch bug" into rvc-qpr-dev