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

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