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