Merge "Mark activity as visible and not stopped after resume-relaunch." into nyc-dev