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