Merge "Prevent the decor view to be visible again after exit animation finish." into sc-dev