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