Get rid of confusing GET_LAYER_SET_CMD
Fix restoring selection on ESC