Merge "Prevent SIGN_IN notification pop up several times"