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

Change-Id: I6bdb4e9b41af9330405577fb18123720038530d0