Merge "Fix crash when activity not attached after search index finishes." into oc-dev
am: d3e33ebcef

Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260