Merge "Move super call to top of onActivityCreated" into jb-mr1-dev