Merge changes Ifecff4f1,Ia302de46 into nyc-dev

* changes:
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.