Merge "Update incompatible charger checking rule" into main