VREditor - Vive: HMD waking up from "sleep" triggers Auto Entry to VR

Normally this has not been as much of an issue, but recently SteamVR has dramatically decrease the time-out / "sleep" timer to something along the lines of 5-10 seconds... so the headset constantly goes to sleep. Bumping the headset will wake HMD will trigger the auto-entry.

See below gif

1. Open a Project
2. Ensure VREditor is enabled (and Auto-Entry) Editor preferences -> Experimental -> VR
3. Wait 10-15 seconds for SteamVR to put the headset into standby
4. Bump the headset to wake it

Result: Auto-entry to VREditor starts