Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev