Merge "Non-functionally simplify permission checking logic" into main