Merge "Fix the transition of the up-button." into sc-dev