Merge "Notify keyguardGoingAway prior to making the call." into main