This fixes a bug where the return key was showing in some layouts for choose/confirm password screens in Settings. Now we just use "actionNext" which ensures we see consistent behavior across devices. Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a