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