Merge "Revert^6 "Enable Shell Transitions""