Merge "Added last focused window to notifyFocusChanged callback"