Merge "Move overlay click handling back to SystemUI." into main