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