Bug 911659 - build script settings.js would return error when setting GAIA_DEV_PIXELS_PER_PX=1.5
Merge pull request #11882 from yurenju/911659

Bug 911659 - build script settings.js would return error when setting GA... r=@timdream
Bug 893560 - [System] Display a keyboard switching shortcut on utility tray when a keyboard is in use