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