Merge "Background activity starts are now blocked by default." into qt-dev am: 3178ea5f2d
am: 6646a8ce58

Change-Id: Icb1269f9b27e17443c16f5908f81cdb93e8952aa