Merge \"Fix testHideShow on pre-ICS\" into nyc-support-24.1-dev
am: 7bb58340f7

Change-Id: I09fe1f90bae92606b7f5360823d3afcf039ea965