Merge "Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev am: eaf3590eda" into pi-dev-plus-aosp
am: 6947fbbdd0

Change-Id: I791021aa5de1c3bf1e256c0d26c442e21c13c5ed