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