Merge "Turn off deprecated sdk dialog" into main