Merge "Update error haptics for coex" into sc-dev