Merge "Don't include PiP activity in app transit" into tm-dev