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

Change-Id: I511cb6e7b2e9c039d5148925d8a8cbb53bbed849