Merge "Check extra type before blindingly casting to Parcelable." into nyc-dev