Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev