Merge "Improve transition between AOD and lockscreen when media is playing for split shade" into udc-dev