Merge "Let sendShowMessage called from hide to show" am: e7d04d728c am: f91fddddd1
am: ef2ac4066b

Change-Id: Ic2dc363d4a26b9c3a10e0b7d1072765501eec383