Merge "[Motion] Split-shade expansion on LS: move keyguard views" into tm-dev