Merge "Add music (piano) icon for zen mode picker" into main