Merge "Don't add a dismiss target to WM if we're not in PiP." into tm-qpr-dev