Merge "Add flag listeners." into sc-v2-dev