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

Change-Id: I85a37f7bd74feae235befb53cda0a5ff100805e4