Merge "Fix the inconsistency of scan status." into oc-dr1-dev