Fixed issue with rightButtons getting ignored in preference for empty Screen buttons (#589)

src/deprecated/platformSpecificDeprecated.android.js

@@ -388,6 +388,7 @@ function addNavigatorParams(screen, navigator = null, idx = '') {
 }
 
 function addNavigatorButtons(screen, sideMenuParams) {
+
   const Screen = Navigation.getRegisteredScreen(screen.screen);
   if (screen.navigatorButtons == null) {
     screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
@@ -514,9 +515,17 @@ function getLeftButtonDeprecated(screen) {
 function getRightButtons(screen) {
   if (screen.navigatorButtons && screen.navigatorButtons.rightButtons) {
     return screen.navigatorButtons.rightButtons;
+  } else if (screen.rightButtons) {
+    return screen.rightButtons
+  }
+
+  const Screen = Navigation.getRegisteredScreen(screen.screen);
+
+  if (Screen.navigatorButtons && !_.isEmpty(Screen.navigatorButtons)) {
+    return _.cloneDeep(Screen.navigatorButtons);
   }
 
-  return screen.rightButtons;
+  return null;
 }
 
 function addNavigationStyleParams(screen) {