Revert^6 "Enable Shell Transitions" ece17fbd884dbc1063eff8d6483cdc72de002204 Change-Id: I560f0de7aa66439aed7904d4549f5fafdabd20b5