Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into nyc-mr2-dev

* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
  Protect VPN dialogs against overlay.