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

* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
  Finish storage wizard theming.