Merge "Add separate AFV type for options popup dialog." into tm-dev