Merge "Add Kotlin-friendly SingleActivityFactory class" into udc-qpr-dev