Merge "FragmentEntity stuck in memory on "Already exists" error"