Merge "Fix crash in PermissionController" into qt-qpr1-dev