Merge "Use hasBeenResumed() for checking if launcher is resumed" into udc-qpr-dev