am 37ba3ddd: Merge "Use Theme.DeviceDefault.Settings"

* commit '37ba3ddd542274819abfc024529ffbcd8f2e1790':
  Use Theme.DeviceDefault.Settings