Merge "Schedule re-scan contacts directory provider if directory is force updated"