Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635

Change-Id: Ia955c4304c2e623b291c111615c65f012b7c3028