Merge "Fix CharSequence undefined equals lint warning" into main