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