Merge "Fix Gravity toString wrong message issue"