UI state is not preserved yet (controls will be recreated as disabled,
button state won't be restored)

Previous rename was wrong as it overlapped with another variable in use,
thus breaking everything. D'oh !

This reverts commit 2a90d5b3.

Looks like a sed failure happened before ><

This is required to get correct drawing in Locked mode