Merge "Revert^4 "Enable Shell Transitions""