Merge "Make LineHeightSpan.Standard a ParcelableSpan"