Merge "WM: Fix WindowManagerConstants initialization order"