Merge "Place recordLayerHistoryAnimationTx behind flag" into main