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