Merge "Change input handling to allow button ripples." into main