Merge "Scrolling search results and autorotate cause crash" am: d1a2bef27a am: e68c1cdc5b am: 72dd8534e4

Change-Id: I64fb2698bfca63b1ab7c1c06a9b3e5a9f1049918