am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose

* commit '339b0ec914d4ec3863aba1cba7329a2e69a308e2':
  Trying to come up with a simpler approach for onShow/onHide.