* Fix activity-not-enabled launch failures
* Fix persisting dynamic defaults

