Merge "Add metrics for new settings conditional cards." into pi-dev