am 6d418b43: am db963b1c: am e353ccbf: am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev

* commit '6d418b43e566a48729bc122cf58d3f9399fb2274':
  Update for bug #17521147 Settings activity looks terrible on Volantis