Merge "Increase HandlerUtilsTest timeout to 500ms" into main