Merge "Revert "[flexiglass] Add bouncer predictive back motion test"" into main