Merge "Window Manager Flag Migration (1/n)"