Merge "Mark return value of onBind() as @Nullable"