Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1