Merge "Added last focused window to notifyFocusChanged callback (2/3)"