Range-diff !420

back to !420 Parity: the iOS client has the watch preference