Merge "Replace {@code} with backticks in thermal NDK comment" into main