Merge "Do not display "null" in sign-in note details" into main