Merge "Don't move PiP towards a corner after user manually moved it." into tm-qpr-dev