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