Merge "Move shell Transitions into a package"