Merge "Update private space animation timings" into main