Merge "Always trigger prop change event for WAIT_FOR_VHAL." into tm-dev