Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev