Merge "Increase contrast of PIP menu controls" into main