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