Merge "Revert "Window Manager Flag Migration (4/n)""