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

Change-Id: Iaf224b256cdc9b86a96ffdc2aaaaa5918c0f5378