diff --git a/.circleci/config.yml b/.circleci/config.yml
index a873772888e..ea7dda258ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -550,14 +550,14 @@ workflows:
             - test
           filters:
             branches:
-              only: /^build-pr-.*/
+              only: /^(build|android)-pr-.*/
       - build-ios-pr:
           context: mattermost-mobile-ios-pr
           requires:
             - test
           filters:
             branches:
-              only: /^build-pr-.*/
+              only: /^(build|ios)-pr-.*/
 
       - build-android-unsigned:
           context: mattermost-mobile-unsigned
diff --git a/app/components/autocomplete/at_mention/at_mention.js b/app/components/autocomplete/at_mention/at_mention.js
index 1bc74fc016e..583a9ffaba2 100644
--- a/app/components/autocomplete/at_mention/at_mention.js
+++ b/app/components/autocomplete/at_mention/at_mention.js
@@ -251,15 +251,16 @@ export default class AtMention extends PureComponent {
 
         return (
             <SectionList
-                testID='at_mention_suggestion.list'
                 keyboardShouldPersistTaps='always'
                 keyExtractor={this.keyExtractor}
-                style={[style.listView, {maxHeight: maxListHeight}]}
-                sections={sections}
-                renderItem={this.renderItem}
-                renderSectionHeader={this.renderSectionHeader}
                 initialNumToRender={10}
                 nestedScrollEnabled={nestedScrollEnabled}
+                removeClippedSubviews={true}
+                renderItem={this.renderItem}
+                renderSectionHeader={this.renderSectionHeader}
+                style={[style.listView, {maxHeight: maxListHeight}]}
+                sections={sections}
+                testID='at_mention_suggestion.list'
             />
         );
     }
diff --git a/app/components/autocomplete/channel_mention/channel_mention.js b/app/components/autocomplete/channel_mention/channel_mention.js
index 1608446eaee..b53a28af5a1 100644
--- a/app/components/autocomplete/channel_mention/channel_mention.js
+++ b/app/components/autocomplete/channel_mention/channel_mention.js
@@ -225,15 +225,16 @@ export default class ChannelMention extends PureComponent {
 
         return (
             <SectionList
-                testID='channel_mention_suggestion.list'
                 keyboardShouldPersistTaps='always'
                 keyExtractor={this.keyExtractor}
-                style={[style.listView, {maxHeight: maxListHeight}]}
-                sections={sections}
-                renderItem={this.renderItem}
-                renderSectionHeader={this.renderSectionHeader}
                 initialNumToRender={10}
                 nestedScrollEnabled={nestedScrollEnabled}
+                removeClippedSubviews={true}
+                renderItem={this.renderItem}
+                renderSectionHeader={this.renderSectionHeader}
+                style={[style.listView, {maxHeight: maxListHeight}]}
+                sections={sections}
+                testID='channel_mention_suggestion.list'
             />
         );
     }
diff --git a/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap b/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
index f1b65b1055b..2bdcc0c8595 100644
--- a/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
+++ b/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
@@ -3036,7 +3036,7 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
   numColumns={1}
   onEndReachedThreshold={2}
   pageSize={10}
-  removeClippedSubviews={false}
+  removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={50}
   style={
diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index 3f53eac06c0..da5e8135a46 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -230,6 +230,7 @@ export default class EmojiSuggestion extends PureComponent {
                 extraData={this.state}
                 data={this.state.dataSource}
                 keyExtractor={this.keyExtractor}
+                removeClippedSubviews={true}
                 renderItem={this.renderItem}
                 pageSize={10}
                 initialListSize={10}
diff --git a/app/components/autocomplete/slash_suggestion/__snapshots__/slash_suggestion.test.tsx.snap b/app/components/autocomplete/slash_suggestion/__snapshots__/slash_suggestion.test.tsx.snap
index adbb00233ed..e6a7c7a7896 100644
--- a/app/components/autocomplete/slash_suggestion/__snapshots__/slash_suggestion.test.tsx.snap
+++ b/app/components/autocomplete/slash_suggestion/__snapshots__/slash_suggestion.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`components/autocomplete/slash_suggestion should match snapshot 1`] = `
   nestedScrollEnabled={false}
   numColumns={1}
   onEndReachedThreshold={2}
-  removeClippedSubviews={false}
+  removeClippedSubviews={true}
   renderItem={[Function]}
   scrollEventThrottle={50}
   style={
diff --git a/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx b/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx
index a31714d129e..f8342e0cf85 100644
--- a/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx
+++ b/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx
@@ -265,6 +265,7 @@ export default class SlashSuggestion extends PureComponent<Props, State> {
                 extraData={this.state}
                 data={this.state.dataSource}
                 keyExtractor={this.keyExtractor}
+                removeClippedSubviews={true}
                 renderItem={this.renderItem}
                 nestedScrollEnabled={nestedScrollEnabled}
             />
diff --git a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
index 94cd1bdb563..dbeaadc324f 100644
--- a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
+++ b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
@@ -103,7 +103,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
         onScroll={[Function]}
         onScrollToIndexFailed={[Function]}
         pageSize={50}
-        removeClippedSubviews={false}
+        removeClippedSubviews={true}
         renderItem={[Function]}
         renderSectionHeader={[Function]}
         scrollEventThrottle={50}
diff --git a/app/components/emoji_picker/emoji_picker_base.js b/app/components/emoji_picker/emoji_picker_base.js
index 5bfc3a19f5e..264c52ee5ad 100644
--- a/app/components/emoji_picker/emoji_picker_base.js
+++ b/app/components/emoji_picker/emoji_picker_base.js
@@ -264,15 +264,16 @@ export default class EmojiPicker extends PureComponent {
 
             listComponent = (
                 <FlatList
+                    contentContainerStyle={contentContainerStyle}
                     data={filteredEmojis}
-                    initialListSize={10}
                     keyboardShouldPersistTaps='always'
                     keyExtractor={this.flatListKeyExtractor}
+                    initialListSize={10}
+                    ListEmptyComponent={this.renderEmptyList}
                     nativeID={SCROLLVIEW_NATIVE_ID}
                     pageSize={10}
                     renderItem={this.flatListRenderItem}
-                    ListEmptyComponent={this.renderEmptyList}
-                    contentContainerStyle={contentContainerStyle}
+                    removeClippedSubviews={true}
                     style={styles.flatList}
                 />
             );
@@ -292,7 +293,7 @@ export default class EmojiPicker extends PureComponent {
                     onScroll={this.onScroll}
                     onScrollToIndexFailed={this.handleScrollToSectionFailed}
                     pageSize={50}
-                    removeClippedSubviews={false}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     renderSectionHeader={this.renderSectionHeader}
                     sections={emojis}
diff --git a/app/components/post_list/__snapshots__/post_list.test.js.snap b/app/components/post_list/__snapshots__/post_list.test.js.snap
index 8df39d6fd56..a5c1bf5f7e8 100644
--- a/app/components/post_list/__snapshots__/post_list.test.js.snap
+++ b/app/components/post_list/__snapshots__/post_list.test.js.snap
@@ -57,7 +57,7 @@ exports[`PostList setting channel deep link 1`] = `
         tintColor="#3d3c40"
       />
     }
-    removeClippedSubviews={false}
+    removeClippedSubviews={true}
     renderItem={[Function]}
     scrollEventThrottle={60}
     style={
@@ -134,7 +134,7 @@ exports[`PostList setting permalink deep link 1`] = `
         tintColor="#3d3c40"
       />
     }
-    removeClippedSubviews={false}
+    removeClippedSubviews={true}
     renderItem={[Function]}
     scrollEventThrottle={60}
     style={
@@ -211,7 +211,7 @@ exports[`PostList should match snapshot 1`] = `
         tintColor="#3d3c40"
       />
     }
-    removeClippedSubviews={false}
+    removeClippedSubviews={true}
     renderItem={[Function]}
     scrollEventThrottle={60}
     style={
diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js
index 52a75e30fd5..40c9d1f2bf1 100644
--- a/app/components/post_list/post_list.js
+++ b/app/components/post_list/post_list.js
@@ -516,7 +516,7 @@ export default class PostList extends PureComponent {
                     onScrollToIndexFailed={this.handleScrollToIndexFailed}
                     ref={this.flatListRef}
                     refreshControl={refreshControl}
-                    removeClippedSubviews={false}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     scrollEventThrottle={60}
                     style={styles.flex}
diff --git a/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js b/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js
index d5e18b4fd77..266a1bcc2f2 100644
--- a/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js
+++ b/app/components/sidebars/main/channels_list/filtered_list/filtered_list.js
@@ -383,6 +383,7 @@ class FilteredList extends Component {
             <View style={styles.container}>
                 <SectionList
                     sections={dataSource}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     renderSectionHeader={this.renderSectionHeader}
                     keyExtractor={this.keyExtractor}
diff --git a/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap b/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap
index 59945edea07..43150d13cdd 100644
--- a/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap
+++ b/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap
@@ -21,6 +21,7 @@ exports[`ChannelsList List should match snapshot 1`] = `
     onEndReachedThreshold={2}
     onScrollBeginDrag={[Function]}
     onViewableItemsChanged={[Function]}
+    removeClippedSubviews={true}
     renderItem={[Function]}
     renderSectionHeader={[Function]}
     scrollEventThrottle={50}
diff --git a/app/components/sidebars/main/channels_list/list/list.js b/app/components/sidebars/main/channels_list/list/list.js
index aab8911dd40..3f1a6c277f1 100644
--- a/app/components/sidebars/main/channels_list/list/list.js
+++ b/app/components/sidebars/main/channels_list/list/list.js
@@ -411,6 +411,7 @@ export default class List extends PureComponent {
                     ref={this.setListRef}
                     sections={sections}
                     contentContainerStyle={{paddingBottom}}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     renderSectionHeader={this.renderSectionHeader}
                     keyboardShouldPersistTaps={'always'}
diff --git a/app/components/sidebars/main/teams_list/teams_list.js b/app/components/sidebars/main/teams_list/teams_list.js
index 479a26006b5..80da7ef319b 100644
--- a/app/components/sidebars/main/teams_list/teams_list.js
+++ b/app/components/sidebars/main/teams_list/teams_list.js
@@ -179,6 +179,7 @@ export default class TeamsList extends PureComponent {
                     extraData={this.state.serverUrl}
                     contentContainerStyle={this.listContentPadding()}
                     data={teamIds}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     keyExtractor={this.keyExtractor}
                     viewabilityConfig={VIEWABILITY_CONFIG}
diff --git a/app/screens/pinned_posts/pinned_posts.js b/app/screens/pinned_posts/pinned_posts.js
index 8044c4a7779..35de51d7a0d 100644
--- a/app/screens/pinned_posts/pinned_posts.js
+++ b/app/screens/pinned_posts/pinned_posts.js
@@ -214,6 +214,7 @@ export default class PinnedPosts extends PureComponent {
                     keyExtractor={this.keyExtractor}
                     keyboardShouldPersistTaps='always'
                     keyboardDismissMode='interactive'
+                    removeClippedSubviews={true}
                     renderItem={this.renderPost}
                     onViewableItemsChanged={this.onViewableItemsChanged}
                 />
diff --git a/app/screens/recent_mentions/recent_mentions.js b/app/screens/recent_mentions/recent_mentions.js
index 8312589861b..2d0f1b69d2d 100644
--- a/app/screens/recent_mentions/recent_mentions.js
+++ b/app/screens/recent_mentions/recent_mentions.js
@@ -214,6 +214,7 @@ export default class RecentMentions extends PureComponent {
                     keyExtractor={this.keyExtractor}
                     keyboardShouldPersistTaps='always'
                     keyboardDismissMode='interactive'
+                    removeClippedSubviews={true}
                     renderItem={this.renderPost}
                     onViewableItemsChanged={this.onViewableItemsChanged}
                 />
diff --git a/app/screens/saved_posts/saved_posts.js b/app/screens/saved_posts/saved_posts.js
index f9cdf3a13b7..febb834a2e1 100644
--- a/app/screens/saved_posts/saved_posts.js
+++ b/app/screens/saved_posts/saved_posts.js
@@ -219,6 +219,7 @@ export default class SavedPosts extends PureComponent {
                     keyExtractor={this.keyExtractor}
                     keyboardShouldPersistTaps='always'
                     keyboardDismissMode='interactive'
+                    removeClippedSubviews={true}
                     renderItem={this.renderPost}
                     onViewableItemsChanged={this.onViewableItemsChanged}
                 />
diff --git a/app/screens/search/__snapshots__/search.test.js.snap b/app/screens/search/__snapshots__/search.test.js.snap
index 448c6b91fcf..082ed59cdee 100644
--- a/app/screens/search/__snapshots__/search.test.js.snap
+++ b/app/screens/search/__snapshots__/search.test.js.snap
@@ -98,6 +98,7 @@ exports[`Search should match snapshot 1`] = `
       onLayout={[Function]}
       onScroll={[Function]}
       onViewableItemsChanged={[Function]}
+      removeClippedSubviews={true}
       renderSectionHeader={[Function]}
       scrollEventThrottle={60}
       sections={
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
index a15a048d1d9..a179a3429ae 100644
--- a/app/screens/search/search.js
+++ b/app/screens/search/search.js
@@ -747,6 +747,7 @@ export default class Search extends PureComponent {
                     <SectionList
                         ref={this.setListRef}
                         style={style.sectionList}
+                        removeClippedSubviews={true}
                         renderSectionHeader={this.renderSectionHeader}
                         sections={sections}
                         keyboardShouldPersistTaps='always'
diff --git a/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap b/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap
index e8e8a7ce2d1..079ed229863 100644
--- a/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap
+++ b/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap
@@ -78,7 +78,7 @@ exports[`Settings SelectTimezone should match snapshot 1`] = `
     maxToRenderPerBatch={15}
     numColumns={1}
     onEndReachedThreshold={2}
-    removeClippedSubviews={false}
+    removeClippedSubviews={true}
     renderItem={[Function]}
     scrollEventThrottle={50}
     updateCellsBatchingPeriod={50}
diff --git a/app/screens/settings/timezone/select_timezone/select_timezone.js b/app/screens/settings/timezone/select_timezone/select_timezone.js
index bcf09345747..bbe331d8c6d 100644
--- a/app/screens/settings/timezone/select_timezone/select_timezone.js
+++ b/app/screens/settings/timezone/select_timezone/select_timezone.js
@@ -137,6 +137,7 @@ export default class Timezone extends PureComponent {
                 </View>
                 <FlatList
                     data={this.filteredTimezones(value)}
+                    removeClippedSubviews={true}
                     renderItem={this.renderItem}
                     keyExtractor={this.keyExtractor}
                     getItemLayout={this.getItemLayout}
diff --git a/app/utils/images.js b/app/utils/images.js
index 1685e4b0f95..32e28382473 100644
--- a/app/utils/images.js
+++ b/app/utils/images.js
@@ -141,16 +141,31 @@ export function openGalleryAtIndex(index, files) {
                 push: {
                     waitForRender: true,
                     sharedElementTransitions,
-                    ...Platform.select({ios: {
-                        content: contentPush,
-                    }}),
-                },
-                pop: {
-                    content: contentPop,
                 },
             },
         };
 
+        if (Object.keys(contentPush).length) {
+            options.animations.push = {
+                ...options.animations.push,
+                ...Platform.select({
+                    android: contentPush,
+                    ios: {
+                        content: contentPush,
+                    },
+                }),
+            };
+        }
+
+        if (Object.keys(contentPop).length) {
+            options.animations.pop = Platform.select({
+                android: contentPop,
+                ios: {
+                    content: contentPop,
+                },
+            });
+        }
+
         goToScreen(screen, '', passProps, options);
     });
 }
diff --git a/share_extension/screens/channel_list.tsx b/share_extension/screens/channel_list.tsx
index 87f04033429..b15110767f8 100644
--- a/share_extension/screens/channel_list.tsx
+++ b/share_extension/screens/channel_list.tsx
@@ -172,6 +172,7 @@ const ChannelList = ({intl}: ChannnelListProps) => {
                 style={styles.flex}
                 sections={sections}
                 ItemSeparatorComponent={renderItemSeparator}
+                removeClippedSubviews={true}
                 renderItem={renderItem}
                 renderSectionHeader={renderSectionHeader}
                 keyExtractor={keyExtractor}
diff --git a/share_extension/screens/team_list.tsx b/share_extension/screens/team_list.tsx
index 56f6ab0f644..447273d8383 100644
--- a/share_extension/screens/team_list.tsx
+++ b/share_extension/screens/team_list.tsx
@@ -76,6 +76,7 @@ const TeamList = () => {
             testID='share_extension.team_list.screen'
             data={teams}
             ItemSeparatorComponent={renderItemSeparator}
+            removeClippedSubviews={true}
             renderItem={renderItem}
             keyExtractor={keyExtractor}
             keyboardShouldPersistTaps='always'