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