Merge "Disallow background activity starts when starting a dropped intent" into main