Workaround for super dev mode line offset issue (#14051)

Change-Id: I29f59fce90b7060a97787d3c3ce12f890af40079