Merge "Use AfW user handle when setting auto_sync for work" into oc-dev