Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev