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