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