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

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