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

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