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

Change-Id: I8aa277a5448b999496b79f6b5721738d3b5f9af7