Merge "Account for OHM offset before possibly hiding the PIP menu" into sc-dev