Merge "Fix detectSpecialFormat in onIdleMaintenance to separate query/update" into sc-mainline-prod