Merge "Calling pageTransisionEnd only after edgeEffect finishes" into sc-dev