Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp