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