Merge "Some fixes for transition animation selection"