Transition Before & After improvements

Better managed callbacks for screen transitions.