Merge "Follow-up improvements to zen mode icon picker" into main