Merge "Smoother signal bar transition during CBRS data switching" into rvc-dev