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

Change-Id: I3b6ed2a830497a7cfa585e6f8f40b264d3ca299d