Merge "Don't prepare transition if token is not visible"