Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev