Merge "Gracefully handle missing permission" into main