Merge "Update last active user." into pi-dev