Merge "Update set last active user to exclude ephemeral users." into pi-dev