Merge "GraphicsEnv: refactor to unify the debuggable logic"