Merge "Fix WindowManagerServiceTests break"