Merge "SnapdragonCamera: Settings display incomplete when set font size as largest" into camera.lnx.1.0-dev.1.0