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

* commit '043d74855cc1cd4fe06d4b98a46f25cad020dd4b':