Merge "Fix the media launch animation on lockscreen" into sc-dev