am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev

* commit '5fafa130ec8f031310e5372a89034057053fa634':
  Finish storage wizard theming.