Merge "Fix for issue :  3419353 Crash during transition generation" into honeycomb