Merge "Revert "Make sure launcher side can animate divider""