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

Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4