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

Change-Id: I2ad5e4a55184fc9a5b4e291bb0e0f45bd97f0bd4