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