Merge "Set psDivider to gone in collapse due to updateAdapterItem suppression in test." into main