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