Merge "RequiresPermissionChecker: change detection method" into main