Merge "Recover AOD state when leaving battery saver" into rvc-dev