Merge "Remove pip resize flicks" into tm-qpr-dev