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