Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev