Merge "Refactor SearchFragment to fix keyboard focus issue." into rvc-dev