Merge "Lighter Quick Settings" into oc-mr1-dev