Cleanup background activity starts for release.
am: 9e2457622a

Change-Id: I220c6b6f18d28ee011957da97bd5258904d09ddc