Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev