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