merge in lmp-mr1-release history after reset to lmp-mr1-dev
tree: 7e706df72d8ddb7eb2143a991b04423c2b871b6b
  1. QuickSettings/
  2. Settings/