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

Change-Id: I5365ac190fa3840cfcee72faa699c2d91d3c2685