Merge "Fix Select mode problem with animation off" into main