Merge "Revert of revert: Motion - tweak split shade expansion on lockscreen with media." into tm-dev