Merge "Fix abnormal behavior on search page" into sc-v2-dev am: ee18babe99 am: d61e61e630

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16284151

Change-Id: I41955dcfe3f4886776d958233c078c5d11a9558f