Merge "GraphicsEnv: refactor to unify the debuggable logic" into qt-qpr1-dev