Merge "More judicious permission-change handling" into main