Merge "Adjustments to PIP heuristics to snapping along edges of screen"