am a130ad32: am def01fb8: Merge "Trying to get onShow in all the right places" into jb-ub-now-indigo-rose

* commit 'a130ad32c38189531e2ee7ba2813921a346118fc':
  Trying to get onShow in all the right places