am 91e18dde: am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose
* commit '91e18ddec4bb9eb3b41d2bc29343360fdbf270e5':
This commit is contained in: