Merge "Fix crash in PermissionController" into qt-qpr1-dev am: 35b5671711

Change-Id: I87a6f8ceeb63a1a0532b3d0dd89c9d7af4d1f383