Merge "Add eventMask to DM.registerDisplayListener" into sc-dev