Merge "overlay: Fix IconPackRoundedThemePickerOverlay package name" am: de032f2e am: d2487892 am: 7c60c0f7 Change-Id: Ia23382c6dd9353bad5be574c5be412af5dc9c41a