SPLIN-1454 Fix some bugs around bundle update on android.