Merge "Fix multi-dimen app transition delay tron event"