Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev