Merge "Fix crash while searching in Settings" am: 176c0c5d98 am: d705a333ca am: 16455893d7
am: 8510f57509

Change-Id: I58f746d72597db65456a4d09308c82a422fd318b