Cleanup background activity starts for release. am: 9e2457622a
am: b68ff5ab78

Change-Id: Ie28816eba7490d34b72f188bc907c309bf669287