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