Merge "Fix string where it says "phone" on a tablet." into oc-dev