Merge "Fix crash due to bad maxLines defined for dialog titles on watch type...
Merge "Fix crash due to bad maxLines defined for dialog titles on watch type devices." into oc-dev am: 93a2f19f
am: 64f9d408
Change-Id: I4f3834c8d6067b922457fe7a713a5de343b7ff9a