Merge "Add missing permission checks for adding permission listeners." into main