Fix the custom theme page shape bug

- Issue: Press previous button at the custom theme naming page, and then change the app icon shape, then go nxet to the naming page, the app icon does not change.
- Issue video: https://drive.google.com/file/d/1A6NLrtQxrT6fNEYZdll_IFDqXWemHfAE/view?usp=sharing
- Issue screenshot: https://screenshot.googleplex.com/WsYaV0XkL7p.png

- Root cause: the shape app icons are added to the end of the app icon list, and then the UI still get the ahead icons.
- Solution: Replace the whole shape app icon list instead of appending icons.
    Video: https://drive.google.com/file/d/1y4bPYU7Y4Ej0cTyxzvOfNXvIQjm-eXqM/view?usp=sharing

Also add app name for custom theme page...

Test: Manually
Bug: 151285476
Change-Id: I7e6def1e7d18d0ef2e5e4fa198348fbdc20ee746