Merge "Fix hw layer overdraw/update visualization" into nyc-dev