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

Change-Id: I35815ebb9c03d91777dc63416ad2c339585b6558