Merge "Fix last character of password field being visible after rotation"