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

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