Merge "Add timeout for setPermissionGrantState" into qt-dev