Merge "[Motion] Split-shade transition on LS: move keyguard even when media is not showing" into tm-dev