Merge "Converting more pressBack calls to calls that wait for animation" into main