Merge "Removing unused debug overlay code."