Merge "Don't block activity starts in permissive mode." into qt-dev