Merge "AOD: disable quicksettings while dozing" into oc-dev