Merge "Finish immediately if the resumed activity is already visible" into nyc-dev