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