Merge "Replace old app transition type to new transition type (1/N)"