diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index f2a648797..abe6a75af 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -70,12 +70,10 @@ type Props = $ReadOnly<{|
  * See http://facebook.github.io/react-native/docs/activityindicator.html
  */
 const ActivityIndicator = (
-  props: $ReadOnly<{|
-    ...Props,
-    forwardedRef?: ?React.Ref<'RCTActivityIndicatorView'>,
-  |}>,
+  props: Props,
+  forwardedRef?: ?React.Ref<'RCTActivityIndicatorView'>,
 ) => {
-  const {onLayout, style, forwardedRef, ...restProps} = props;
+  const {onLayout, style, ...restProps} = props;
   let sizeStyle;
 
   switch (props.size) {
@@ -99,16 +97,19 @@ const ActivityIndicator = (
   };
 
   return (
-    <View onLayout={onLayout} style={[styles.container, style]}>
+    <View
+      onLayout={onLayout}
+      style={StyleSheet.compose(
+        styles.container,
+        style,
+      )}>
       <RCTActivityIndicator {...nativeProps} />
     </View>
   );
 };
 
 // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
-const ActivityIndicatorWithRef = React.forwardRef((props: Props, ref) => {
-  return <ActivityIndicator {...props} forwardedRef={ref} />;
-});
+const ActivityIndicatorWithRef = React.forwardRef(ActivityIndicator);
 
 ActivityIndicatorWithRef.defaultProps = {
   animating: true,
@@ -116,7 +117,6 @@ ActivityIndicatorWithRef.defaultProps = {
   hidesWhenStopped: true,
   size: 'small',
 };
-ActivityIndicatorWithRef.displayName = 'ActivityIndicator';
 
 const styles = StyleSheet.create({
   container: {
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index 7ea083dd0..f343e2e54 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -4,41 +4,60 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow
  * @format
  */
 
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const PropTypes = require('prop-types');
 const React = require('React');
-const ViewPropTypes = require('ViewPropTypes');
 
 const requireNativeComponent = require('requireNativeComponent');
 
-const STYLE_ATTRIBUTES = [
-  'Horizontal',
-  'Normal',
-  'Small',
-  'Large',
-  'Inverse',
-  'SmallInverse',
-  'LargeInverse',
-];
+import type {NativeComponent} from 'ReactNative';
+import type {ViewProps} from 'ViewPropTypes';
 
-const indeterminateType = function(props, propName, componentName, ...rest) {
-  const checker = function() {
-    const indeterminate = props[propName];
-    const styleAttr = props.styleAttr;
-    if (!indeterminate && styleAttr !== 'Horizontal') {
-      return new Error(
-        'indeterminate=false is only valid for styleAttr=Horizontal',
-      );
-    }
-  };
+const AndroidProgressBar = requireNativeComponent('AndroidProgressBar');
 
-  return PropTypes.bool(props, propName, componentName, ...rest) || checker();
-};
+type Props = $ReadOnly<{|
+  ...ViewProps,
+
+  /**
+   * Style of the ProgressBar and whether it shows indeterminate progress (e.g. spinner).
+   *
+   * `indeterminate` can only be false if `styleAttr` is Horizontal, and requires a
+   * `progress` value.
+   */
+  ...
+    | {|
+        styleAttr: 'Horizontal',
+        indeterminate: false,
+        progress: number,
+      |}
+    | {|
+        typeAttr:
+          | 'Horizontal'
+          | 'Normal'
+          | 'Small'
+          | 'Large'
+          | 'Inverse'
+          | 'SmallInverse'
+          | 'LargeInverse',
+        indeterminate: true,
+      |},
+  /**
+   * Whether to show the ProgressBar (true, the default) or hide it (false).
+   */
+  animating?: ?boolean,
+  /**
+   * Color of the progress bar.
+   */
+  color?: ?string,
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: ?string,
+|}>;
 
 /**
  * React component that wraps the Android-only `ProgressBar`. This component is
@@ -63,59 +82,20 @@ const indeterminateType = function(props, propName, componentName, ...rest) {
  * },
  * ```
  */
-class ProgressBarAndroid extends React.Component {
-  static propTypes = {
-    ...ViewPropTypes,
+const ProgressBarAndroid = (
+  props: Props,
+  forwardedRef: ?React.Ref<'AndroidProgressBar'>,
+) => {
+  return <AndroidProgressBar {...props} ref={forwardedRef} />;
+};
 
-    /**
-     * Style of the ProgressBar. One of:
-     *
-     * - Horizontal
-     * - Normal (default)
-     * - Small
-     * - Large
-     * - Inverse
-     * - SmallInverse
-     * - LargeInverse
-     */
-    styleAttr: PropTypes.oneOf(STYLE_ATTRIBUTES),
-    /**
-     * Whether to show the ProgressBar (true, the default) or hide it (false).
-     */
-    animating: PropTypes.bool,
-    /**
-     * If the progress bar will show indeterminate progress. Note that this
-     * can only be false if styleAttr is Horizontal.
-     */
-    indeterminate: indeterminateType,
-    /**
-     * The progress value (between 0 and 1).
-     */
-    progress: PropTypes.number,
-    /**
-     * Color of the progress bar.
-     */
-    color: ColorPropType,
-    /**
-     * Used to locate this view in end-to-end tests.
-     */
-    testID: PropTypes.string,
-  };
+// $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
+const ProgressBarAndroidToExport = React.forwardRef(ProgressBarAndroid);
 
-  static defaultProps = {
-    styleAttr: 'Normal',
-    indeterminate: true,
-    animating: true,
-  };
+ProgressBarAndroidToExport.defaultProps = {
+  styleAttr: 'Normal',
+  indeterminate: true,
+  animating: true,
+};
 
-  render() {
-    const {forwardedRef, ...props} = this.props;
-    return <AndroidProgressBar {...props} ref={forwardedRef} />;
-  }
-}
-
-const AndroidProgressBar = requireNativeComponent('AndroidProgressBar');
-
-module.exports = React.forwardRef((props, ref) => (
-  <ProgressBarAndroid {...props} forwardedRef={ref} />
-));
+module.exports = (ProgressBarAndroidToExport: Class<NativeComponent<Props>>);
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index d9efe0170..7f18a2d3b 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -250,7 +250,6 @@ SliderWithRef.defaultProps = {
   maximumValue: 1,
   step: 0,
 };
-SliderWithRef.displayName = 'Slider';
 
 let styles;
 if (Platform.OS === 'ios') {
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index ed420338c..2cfa05a8c 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -45,7 +45,6 @@ if (__DEV__) {
       </TextAncestor.Consumer>
     );
   };
-  View.displayName = 'View'; // TODO(T30332650) remove bug workaround
   // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
   ViewToExport = React.forwardRef(View);
 }
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index aaa283a6d..2a0a939f8 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -267,7 +267,6 @@ const Text = (
 ) => {
   return <TouchableText {...props} forwardedRef={forwardedRef} />;
 };
-Text.displayName = 'Text'; // TODO(T30332650) remove bug workaround
 // $FlowFixMe - TODO T29156721 `React.forwardRef` is not defined in Flow, yet.
 const TextToExport = React.forwardRef(Text);