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

Change-Id: I8b46e1504a59c6d17b4908853eb4b314bc1e3823