Merge "Control UI - Mop, vacuum, unknown"