Merge "Transitioning media on lockscreen with a fade" into sc-dev