Merge "[Ongoing Call] Make the uidObserver a val so that we're guaranteed to not accidentally register it multiple times in a row." into tm-dev