Merge "Update Sync status icon" into lmp-preview-dev