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