Merge "Fixes the regression that the resumed activity not paused beforehand" into main