fixup! Fix layout context prop resolving for boolean types (#567)

Author: atmelmicro

src/components/_helpers/resolveContextOrProp.js

@@ -1,11 +1,7 @@
 export const resolveContextOrProp = (contextValue, propValue) => {
-  if (contextValue === false) {
+  if (contextValue === false || contextValue === null) {
     return propValue;
   }
 
-  if (contextValue != null) {
-    return contextValue;
-  }
-
-  return propValue;
+  return contextValue;
 };