am 2c1b3755: am ac4bacd9: am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.

Merge commit '2c1b37555e319a177b35e3f91081cd0f0e0e2b22'

* commit '2c1b37555e319a177b35e3f91081cd0f0e0e2b22':