Merge "Cleanup flag "manager_package_monitor_logic_fix"" into main