am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev

* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis