Merge "[6/n] Pin ActivityStack" into udc-qpr-dev