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