Merge "Store whether attribution tag is valid separate from bypass" into sc-dev