Cleanup background activity starts for release.
am: 9e2457622a

Change-Id: I9bc0682105251e2d462859560978763032b195c2