Merge "Added API to register DisplayListener with EventMask" into main