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