Merge "Transitions - Better dozing/aod support" into tm-qpr-dev