Merge "Add safer Intent extra APIs and deprecate old ones"