Merge "Fix transition animation when going back twice" into sc-dev