Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96