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