Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev