Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f
am: d454c3c276

Change-Id: I11840eb0cd06885979f0823d6db05e3e4e0535bb