Merge changes from topic "options-popup-dialog-type" into tm-mainline-prod

* changes:
  [automerge] Add separate AFV type for options popup dialog. 2p: 7ef4fe42cb
  Add separate AFV type for options popup dialog.