Merge "Adding some debug controls to test multi-window."