Merge "Fix media jumping horizontally on lockscreen when expanding split-shade" into tm-qpr-dev