Merge "Add a flag for the spatial model app pushback effect" into main