Merge "Create the EventReceiver with the right display Id" into main