Merge "Add Null check in AppWindowToken.onDisplayChanged."