Merge "Fix NPE in notifyFocusChanged"