Merge "Remove support for in-grid debug info."