Merging in previous AppDelegate hybrid changes
Merge pull request #684 from khawkins/hybrid_appdelegate_updates

Merging in previous AppDelegate hybrid changes