Merge "Update subscription logic for VHAL ref impl." into tm-dev