Merge "Always show 'Not Current' as state when looking at old patch set" into stable-2.11