Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev