Merge "Fix testHideShow on pre-ICS" into nyc-support-24.1-dev