am 04925cca: am afe6d85b: am 355e075a: am 91e18dde: am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose

* commit '04925cca77d7b7d3a1a71c0d581e5c78793148e4':