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

Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2