Merge "Fix crash in settings from incorrect parcelization"