Merge "Update device default colors for darker UI"