Merge "Handle PiP params changes in onTaskInfoChanged" into tm-dev