Merge "Consistently avoid displaying trailing zeroes" into mnc-dev