ENYO-573: Synchronize up/down events based on button

Cherry-picking from master into 2.5-upkeep