Unity

Merge proposals dependent on lp://qastaging/~3v1n0/unity/overlay-disabled-close-button-fix

  1. overlay-disabled-close-button-fix
  2. Dependent merge proposals

lp://qastaging/~3v1n0/unity/overlay-disabled-close-button-fix has no merge proposals.