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