Merge "Don't block activity starts in permissive mode." into qt-dev am: fe0bfe66e9
am: 422ef89213

Change-Id: I93a71f730184952cfba3b19f14e9e8d0a546f19f