Merge "Fix rotating screen triggers search." into rvc-dev