Merge "add a way to toggle the h/w composer at runtime"