Merge "Add trace points for GraphicsEnvironment setup"