Merge "Avoid unavailable APIs in ShellUtil" into main