Merge "Default system theme should be DeviceDefault" into nyc-dev