Merge "Fix issues 5158104 and 4981556 (fragment problems)"