Merge "Partial revert of cl/170369554 to fix video call ringing screen"