Merge "Add support for disabling display scaling for development."