Merge "Fix failing TvPipGravityTest cases" into main