Merge "Fix 6247249: make sure label on tablets is "done" instead of "next""