Minor fixes for iframe logout.

- Make sure timeout is added conditionally, when we actually have it.
- Additionally, pass the state ID to the template in the "auth_state" variable. Trying to be consistent with this from now on.