Fixes options merging

lib/ios/RNNCommandsHandler.m

@@ -67,19 +67,15 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController<RNNLayoutProtocol>* vc = (UIViewController<RNNLayoutProtocol>*)[_store findComponentForId:componentId];
+	UIViewController* vc = [_store findComponentForId:componentId];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
 	
 	while (vc != nil) {
 		if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
-			[vc mergeOptions:options];
+			[(UIViewController<RNNLayoutProtocol>*)vc mergeOptions:options];
 		}
-		vc = (UIViewController<RNNLayoutProtocol>*)vc.parentViewController;
+		vc = vc.parentViewController;
 	}
-
-	[CATransaction commit];
 }
 
 - (void)setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {

lib/ios/RNNNavigationControllerPresenter.m

@@ -4,7 +4,10 @@
 
 - (void)present:(RNNNavigationOptions *)options onViewControllerDidLoad:(UINavigationController *)navigationController {
 	[options applyOnNavigationController:navigationController];
+}
 
+- (void)present:(RNNNavigationOptions *)options onViewControllerWillAppear:(UINavigationController *)navigationController {
+	[options applyOnNavigationController:navigationController];
 }
 
 @end

lib/ios/RNNParentOptionsResolver.m

@@ -3,7 +3,11 @@
 @implementation RNNParentOptionsResolver
 
 - (void)resolve:(UIViewController<RNNLayoutProtocol> *)parent with:(NSArray<UIViewController<RNNLayoutProtocol> *> *)children {
-	
+	for (UIViewController<RNNLayoutProtocol>* child in parent.childViewControllers) {
+		if ([parent conformsToProtocol:@protocol(RNNLayoutProtocol)] && [child conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
+			[parent.options mergeOptions:child.options overrideOptions:YES];
+		}
+	}
 }
 
 @end