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