Merge "Avoid registering DisplayListener to the real service" into main