Merge "Move zen mode type icons from Settings to core (as internal resources)" into main