am 4a1b8898: am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE

* commit '4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
  Fix UI settings display issues