Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev