Update the change helper to support Launcher3

Change-Id: Ie631b2b0cc3c4aa4c51e1f5a317ad8ab3fb184b8
Show the theme name in the choice screen

Change-Id: Id4d054773a9ac1610fe3536850f98928d4848403