Merge "Disable "Reset app preference" during call" into main