Merge "WM: Track waitForConfig per display"