Merge "Do not trigger revoke-perm callbacks if no change" into qt-dev