[Mac] PopOvers switch focus back to the last focused control, rather than the current row's controls

[CartBlanche]

Steps to Repro:
Once the PopOver loses focus, it will jump back to the last focused control. Eg. If Filter Control has focus and you then the user opens the CustomExpression PopOver, then backs out, it will jump back to the Filter text box. This behaviour happens with all the PopOvers, like the Colour one too etc.

What we hope should happen:

• If you click a PropertyButton, it should first focus that row’s controls, before the PopOver appears, so that should you cancel/accept it it focuses on that row’s control?
• If you Select a Color and a PopOver appears it should first focus that row’s controls, before the PopOver appears, so that should you cancel/accept it it focuses on that row’s control?