Merge "Prevent the front-most activity entering pip" into tm-dev