Merge "Short term solution for the in-animation-dismissal-freeze bug." into main