Merge "Move doze animation until finished waking up" into udc-dev