Merge "Showing small lockscreen clock when media player visible in split shade" into sc-v2-dev