Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev