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

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