Merge "Fixed that disconnect message not showing up" am: 2fc6f67431
am: f229354f18

Change-Id: If62437bc35466a5d6b5f53ec37ecaa64388de539