Merge changes from topic "per-display_focus_am"

* changes:
  Update tests for new focus tracking
  Rename getFocusedStack methods
  Per-display focused stacks in AM