Merge "Prevent SIGN_IN notification pop up several times" into qt-dev am: 462864489a
am: ad85847666

Change-Id: If49dd9847e1d1c5ee83985a3d5ea67cab5fb4a5e