Merge "Force snapshot update when requested transform changes from invalid to valid" into main