Merge "Tighten rules for blocking activity starts." into qt-dev
am: c10e65fb56

Change-Id: I66953f9d1a1bb770e9b8fb30fc4d5e7946796f9b