Merge "Disable failing shell transition tests"