Merge "Update Settings to use DeviceDefault colored button"