Merge "Fixes password not being saved on orientation changed."