Merge "Don't skip resume on transient-launch activity" into udc-qpr-dev