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

* commit 'f448c32d9b4718e657fd4811f43d8df0f9d921af':
  Fix UI settings display issues