Bug 916311 - Expired tokens should be hidden

[merge]