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