Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev