Merge "Fixing some interaction issues with the PIP menu."