Merge "Background activity starts are now blocked by default." into qt-dev
am: 3701dd0616

Change-Id: I23c62968dbccb5c956c26f5c4cdc11ac433e610d