Merge "Prevent crash when rotating screen in Settings Search"