Merge "Gingerbread Item Animator bugfix" into lmp-mr1-ub-dev