Merge "Fix failed test CommandContentProviderTest." into main