Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev
am: d46ae2f7ed

Change-Id: I0c969751879f4e7b168fcfac4331cefe45089512