Merge "Break long lines and cleanup some RefreshLinksJob checks"