better handling of always-locate standby/wakeup