Tweak AlertDialog and Preference layout for nonround watches.
am: 6c8e3bb43d

Change-Id: I8403f321396198d1c8b481c920c52448f2c024d0