Merge "Add ability to set/erase flags via intents." into sc-v2-dev