Merge "Fix startPostponedEnterTransition being called too early."