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