Merge "overlay: Fix IconPackRoundedThemePickerOverlay package name" am: de032f2e84 am: d248789271

Change-Id: I1bf20c703b69ad2bafbdd6d77fa5a8e6c9e25d19