Merge "Zero state feature flag" into tm-qpr-dev