Merge "Cleanup background activity starts for release. am: 9e245762 am: 2447bb6e" into qt-r1-dev-plus-aosp am: 045c80c4 Change-Id: I82ff956682f193a661ab72afb485cfbe5b71351d