Merge "Provide UnfoldBgProgressFlag as a singleton" into main