Merging in previous AppDelegate hybrid changes