merge in nyc-release history after reset to nyc-dev
tree: 460fce1c28a90d6a6038b499426e32db4c10a482
  1. QuickSettings/
  2. Settings/