Merge "Reused existing method in getAllPermissionStates" into main