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