Add missing resolutions for existing icon (from AOSP)
Merge branch 'release' into upstream