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