Clean-up and re-added some graphic debug options

Change-Id: I34c42c79590c27cefc484e6ff0f7cc7cac864f64