Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev