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

* commit '95b891af7c77d51f6284e01467bd6323d3749068':
  Finish storage wizard theming.