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