Merge "Add support for extending key validity while on body." into nyc-dev