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