Merge "Add DisplayManager service to BridgeContext"