Was Data doing an impression of Red Dwarf’s Kryten in Picard?

It’s been over a week, this can’t be a spoiler surely?

Red Dwarf fans has been claiming for decades now that various incarnations of modern Star Trek keep nicking all its best ideas. But was Data really doing a homage to Kryten in the Star Trek: Picard finale? Did Dr Noonian Soong also moonlight for DivaDroid? Presumably not, but its uncanny how an older Brent Spiner channelling all those familiar Data facial tics suddenly looks an awful lot like the Dwarf’s cleaning-obsessed droid. Shame he couldn’t have given us a smeeeeeeeeg heeeeaaaaadddd before he left.