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