Merge "Revert layout transition from slice view"