diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a25267b46..78880696929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+# 12.0.1
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o bdc034da8700a9cbd6064823dc045b511d622f8c -n f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008
+	
+No public API changes detected.
+
+## Component changes
+
+### CollectionCells
+
+#### Changes
+
+* [Resize the content view when there is an accessory view.](https://github.com/google/material-components-ios/commit/f6d329602f84cc0839ebdfa622877d70201fd798) (Louis Romero)
+
+### Slider
+
+#### Changes
+
+* [Add discrete positions when editing](https://github.com/google/material-components-ios/commit/7c0d0a654f030b3e3f2d1136f7415a4caa92917c) (Max Luzuriaga)
+
+### Snackbar
+
+#### Changes
+
+* [Add legal info to snackbar files and umbrella header for keyboard watcher](https://github.com/google/material-components-ios/commit/be579f15da376d1029b4bef2abdf5cdd9c65c891) (Junius Gunaratne)
+* [Don't force uppercasing of the button.](https://github.com/google/material-components-ios/commit/f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008) (Louis Romero)
+
 # 12.0.0
 
 ## API diffs
diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
index 2aff46a20f6..8dfdfeb6d15 100644
--- a/MaterialComponents.podspec
+++ b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "12.0.0"
+  s.version      = "12.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
index b6a2e3a5375..033d116b3b0 100644
--- a/MaterialComponentsCatalog.podspec
+++ b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "12.0.0"
+  s.version      = "12.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
index 8be62a4b5f8..0b952a50f81 100644
--- a/MaterialComponentsUnitTests.podspec
+++ b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "12.0.0"
+  s.version      = "12.0.1"
   s.authors      = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"
diff --git a/catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj b/catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj
index 7286f1e25d2..d5887ba0648 100644
--- a/catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj
+++ b/catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj
@@ -89,7 +89,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 666CA6C31CAE277E001B1884 /* Build configuration list for PBXNativeTarget "Catalog" */;
 			buildPhases = (
-				A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */,
+				A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */,
 				5E0C759D6BF372D69AB4361F /* [CP] Check Pods Manifest.lock */,
 				666CA6AD1CAE277E001B1884 /* Sources */,
 				666CA6AE1CAE277E001B1884 /* Frameworks */,
@@ -199,14 +199,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Catalog/Pods-Catalog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */ = {
+		A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/catalog/CatalogByConvention/example/catalog/Podfile.lock b/catalog/CatalogByConvention/example/catalog/Podfile.lock
index 47612ef69d0..c22d3597059 100644
--- a/catalog/CatalogByConvention/example/catalog/Podfile.lock
+++ b/catalog/CatalogByConvention/example/catalog/Podfile.lock
@@ -28,4 +28,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f14a477885bb971999b5fa8afb20a539b2bcabdc
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1
diff --git a/catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj b/catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj
index 48d8b17cf3a..cf91782939e 100644
--- a/catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj
+++ b/catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj
@@ -83,7 +83,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 666CA7001CAE34F0001B1884 /* Build configuration list for PBXNativeTarget "UnitTests" */;
 			buildPhases = (
-				620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */,
+				620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */,
 				3DF90DBC96265E81B0B0A3BB /* [CP] Check Pods Manifest.lock */,
 				666CA6F41CAE34F0001B1884 /* Sources */,
 				666CA6F51CAE34F0001B1884 /* Frameworks */,
@@ -159,14 +159,14 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */ = {
+		620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/catalog/MDCCatalog.xcodeproj/project.pbxproj b/catalog/MDCCatalog.xcodeproj/project.pbxproj
index 7225da2b9b8..39e20913efb 100644
--- a/catalog/MDCCatalog.xcodeproj/project.pbxproj
+++ b/catalog/MDCCatalog.xcodeproj/project.pbxproj
@@ -263,12 +263,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 664524C51C6BA62A001ADBF8 /* Build configuration list for PBXNativeTarget "MDCCatalog" */;
 			buildPhases = (
-				D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */,
+				D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */,
 				664524AF1C6BA62A001ADBF8 /* Sources */,
 				664524B01C6BA62A001ADBF8 /* Frameworks */,
 				664524B11C6BA62A001ADBF8 /* Resources */,
-				72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */,
-				8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */,
+				72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */,
+				8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -359,14 +359,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */ = {
+		72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -374,14 +374,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */ = {
+		8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -389,14 +389,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */ = {
+		D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/catalog/MDCUnitTests.xcodeproj/project.pbxproj b/catalog/MDCUnitTests.xcodeproj/project.pbxproj
index d8762dc1769..0c6785acc22 100644
--- a/catalog/MDCUnitTests.xcodeproj/project.pbxproj
+++ b/catalog/MDCUnitTests.xcodeproj/project.pbxproj
@@ -83,12 +83,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 66CB71311C853DB30099B932 /* Build configuration list for PBXNativeTarget "MDCUnitTests" */;
 			buildPhases = (
-				3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */,
+				3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */,
 				66CB71281C853DB30099B932 /* Sources */,
 				66CB71291C853DB30099B932 /* Frameworks */,
 				66CB712A1C853DB30099B932 /* Resources */,
-				F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */,
-				AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */,
+				F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */,
+				AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -141,14 +141,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */ = {
+		3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -156,14 +156,14 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */ = {
+		AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -171,14 +171,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCUnitTests/Pods-MDCUnitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */ = {
+		F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
index e85319dfd5d..fef327f066c 100644
--- a/catalog/Podfile.lock
+++ b/catalog/Podfile.lock
@@ -1,32 +1,32 @@
 PODS:
   - CatalogByConvention (1.0.0)
-  - MaterialComponents (12.0.0):
-    - MaterialComponents/ActivityIndicator (= 12.0.0)
-    - MaterialComponents/AppBar (= 12.0.0)
-    - MaterialComponents/ButtonBar (= 12.0.0)
-    - MaterialComponents/Buttons (= 12.0.0)
-    - MaterialComponents/CollectionCells (= 12.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 12.0.0)
-    - MaterialComponents/Collections (= 12.0.0)
-    - MaterialComponents/FlexibleHeader (= 12.0.0)
-    - MaterialComponents/FontDiskLoader (= 12.0.0)
-    - MaterialComponents/HeaderStackView (= 12.0.0)
-    - MaterialComponents/Ink (= 12.0.0)
-    - MaterialComponents/NavigationBar (= 12.0.0)
-    - MaterialComponents/OverlayWindow (= 12.0.0)
-    - MaterialComponents/PageControl (= 12.0.0)
-    - MaterialComponents/Palettes (= 12.0.0)
-    - MaterialComponents/private (= 12.0.0)
-    - MaterialComponents/RobotoFontLoader (= 12.0.0)
-    - MaterialComponents/ShadowElevations (= 12.0.0)
-    - MaterialComponents/ShadowLayer (= 12.0.0)
-    - MaterialComponents/Slider (= 12.0.0)
-    - MaterialComponents/Snackbar (= 12.0.0)
-    - MaterialComponents/SpritedAnimationView (= 12.0.0)
-    - MaterialComponents/Switch (= 12.0.0)
-    - MaterialComponents/Typography (= 12.0.0)
-  - MaterialComponents/ActivityIndicator (12.0.0)
-  - MaterialComponents/AppBar (12.0.0):
+  - MaterialComponents (12.0.1):
+    - MaterialComponents/ActivityIndicator (= 12.0.1)
+    - MaterialComponents/AppBar (= 12.0.1)
+    - MaterialComponents/ButtonBar (= 12.0.1)
+    - MaterialComponents/Buttons (= 12.0.1)
+    - MaterialComponents/CollectionCells (= 12.0.1)
+    - MaterialComponents/CollectionLayoutAttributes (= 12.0.1)
+    - MaterialComponents/Collections (= 12.0.1)
+    - MaterialComponents/FlexibleHeader (= 12.0.1)
+    - MaterialComponents/FontDiskLoader (= 12.0.1)
+    - MaterialComponents/HeaderStackView (= 12.0.1)
+    - MaterialComponents/Ink (= 12.0.1)
+    - MaterialComponents/NavigationBar (= 12.0.1)
+    - MaterialComponents/OverlayWindow (= 12.0.1)
+    - MaterialComponents/PageControl (= 12.0.1)
+    - MaterialComponents/Palettes (= 12.0.1)
+    - MaterialComponents/private (= 12.0.1)
+    - MaterialComponents/RobotoFontLoader (= 12.0.1)
+    - MaterialComponents/ShadowElevations (= 12.0.1)
+    - MaterialComponents/ShadowLayer (= 12.0.1)
+    - MaterialComponents/Slider (= 12.0.1)
+    - MaterialComponents/Snackbar (= 12.0.1)
+    - MaterialComponents/SpritedAnimationView (= 12.0.1)
+    - MaterialComponents/Switch (= 12.0.1)
+    - MaterialComponents/Typography (= 12.0.1)
+  - MaterialComponents/ActivityIndicator (12.0.1)
+  - MaterialComponents/AppBar (12.0.1):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -35,15 +35,15 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (12.0.0):
+  - MaterialComponents/ButtonBar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (12.0.0):
+  - MaterialComponents/Buttons (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionCells (12.0.0):
+  - MaterialComponents/CollectionCells (12.0.1):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -54,84 +54,84 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (12.0.0)
-  - MaterialComponents/Collections (12.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (12.0.1)
+  - MaterialComponents/Collections (12.0.1):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/FlexibleHeader (12.0.0)
-  - MaterialComponents/FontDiskLoader (12.0.0)
-  - MaterialComponents/HeaderStackView (12.0.0)
-  - MaterialComponents/Ink (12.0.0)
-  - MaterialComponents/NavigationBar (12.0.0):
+  - MaterialComponents/FlexibleHeader (12.0.1)
+  - MaterialComponents/FontDiskLoader (12.0.1)
+  - MaterialComponents/HeaderStackView (12.0.1)
+  - MaterialComponents/Ink (12.0.1)
+  - MaterialComponents/NavigationBar (12.0.1):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (12.0.0)
-  - MaterialComponents/PageControl (12.0.0)
-  - MaterialComponents/Palettes (12.0.0)
-  - MaterialComponents/private (12.0.0):
-    - MaterialComponents/private/Color (= 12.0.0)
-    - MaterialComponents/private/Icons (= 12.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 12.0.0)
-    - MaterialComponents/private/Overlay (= 12.0.0)
-    - MaterialComponents/private/RTL (= 12.0.0)
-    - MaterialComponents/private/ThumbTrack (= 12.0.0)
-  - MaterialComponents/private/Color (12.0.0)
-  - MaterialComponents/private/Icons (12.0.0):
-    - MaterialComponents/private/Icons/Base (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 12.0.0)
-  - MaterialComponents/private/Icons/Base (12.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (12.0.0):
+  - MaterialComponents/OverlayWindow (12.0.1)
+  - MaterialComponents/PageControl (12.0.1)
+  - MaterialComponents/Palettes (12.0.1)
+  - MaterialComponents/private (12.0.1):
+    - MaterialComponents/private/Color (= 12.0.1)
+    - MaterialComponents/private/Icons (= 12.0.1)
+    - MaterialComponents/private/KeyboardWatcher (= 12.0.1)
+    - MaterialComponents/private/Overlay (= 12.0.1)
+    - MaterialComponents/private/RTL (= 12.0.1)
+    - MaterialComponents/private/ThumbTrack (= 12.0.1)
+  - MaterialComponents/private/Color (12.0.1)
+  - MaterialComponents/private/Icons (12.0.1):
+    - MaterialComponents/private/Icons/Base (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_info (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_reorder (= 12.0.1)
+  - MaterialComponents/private/Icons/Base (12.0.1)
+  - MaterialComponents/private/Icons/ic_arrow_back (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (12.0.0):
+  - MaterialComponents/private/Icons/ic_check (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (12.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (12.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (12.0.0):
+  - MaterialComponents/private/Icons/ic_info (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (12.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (12.0.0)
-  - MaterialComponents/private/Overlay (12.0.0)
-  - MaterialComponents/private/RTL (12.0.0)
-  - MaterialComponents/private/ThumbTrack (12.0.0):
+  - MaterialComponents/private/KeyboardWatcher (12.0.1)
+  - MaterialComponents/private/Overlay (12.0.1)
+  - MaterialComponents/private/RTL (12.0.1)
+  - MaterialComponents/private/ThumbTrack (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/RobotoFontLoader (12.0.0):
+  - MaterialComponents/RobotoFontLoader (12.0.1):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (12.0.0)
-  - MaterialComponents/ShadowLayer (12.0.0)
-  - MaterialComponents/Slider (12.0.0):
+  - MaterialComponents/ShadowElevations (12.0.1)
+  - MaterialComponents/ShadowLayer (12.0.1)
+  - MaterialComponents/Slider (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (12.0.0):
+  - MaterialComponents/Snackbar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (12.0.0)
-  - MaterialComponents/Switch (12.0.0):
+  - MaterialComponents/SpritedAnimationView (12.0.1)
+  - MaterialComponents/Switch (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (12.0.0)
-  - MaterialComponentsCatalog (12.0.0):
+  - MaterialComponents/Typography (12.0.1)
+  - MaterialComponentsCatalog (12.0.1):
     - MaterialComponents
-  - MaterialComponentsUnitTests (12.0.0):
+  - MaterialComponentsUnitTests (12.0.1):
     - MaterialComponents
 
 DEPENDENCIES:
@@ -152,10 +152,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: 0137d280781667dd3d856a14cdf507f5ac8eedc0
-  MaterialComponents: da64cae6db6bef2d7d1c80e10a3c71a18b07bb76
-  MaterialComponentsCatalog: 3c6a3d15087e14ac2b2e5c290860c4cac4a5011f
-  MaterialComponentsUnitTests: 66b39dea98ce533496934a14162661583c062271
+  MaterialComponents: c9194c49be10b8ac59cb8f857bedecbb511705a8
+  MaterialComponentsCatalog: c2911e8ad9f380350107f124f88a43b9fe012d19
+  MaterialComponentsUnitTests: 03755d2a184c1d21a66c86c0e333d7b087e2f662
 
 PODFILE CHECKSUM: cef207e5d4326fe42f1dfc4322297ddb5a6f3fc2
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1
diff --git a/components/CollectionCells/src/MDCCollectionViewCell.m b/components/CollectionCells/src/MDCCollectionViewCell.m
index 3cbde34dcee..6a0cccbb8bd 100644
--- a/components/CollectionCells/src/MDCCollectionViewCell.m
+++ b/components/CollectionCells/src/MDCCollectionViewCell.m
@@ -107,8 +107,8 @@ - (void)prepareForReuse {
 - (void)layoutSubviews {
   [super layoutSubviews];
 
-  self.contentView.frame = [self contentViewFrame];
-  _accessoryView.frame = [self accessoryFrame];
+  // Layout the accessory view and the content view.
+  [self layoutForegroundSubviews];
 
   // Animate editing controls.
   [UIView
@@ -159,14 +159,21 @@ - (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttribut
     // Draw separator if needed.
     [self drawSeparatorIfNeeded];
 
-    self.contentView.frame = [self contentViewFrame];
-    _accessoryView.frame = [self accessoryFrame];
+    // Layout the accessory view and the content view.
+    [self layoutForegroundSubviews];
 
     // Animate cell on appearance settings.
     [self updateAppearanceAnimation];
   }
 }
 
+- (void)layoutForegroundSubviews {
+  // First lay out the accessory view.
+  _accessoryView.frame = [self accessoryFrame];
+  // Then lay out the content view, inset by the accessory view's width.
+  self.contentView.frame = [self contentViewFrame];
+}
+
 #pragma mark - Accessory Views
 
 - (void)setAccessoryType:(MDCCollectionViewCellAccessoryType)accessoryType {
@@ -398,10 +405,12 @@ - (CGRect)contentViewFrame {
           ? CGRectGetWidth(_editingReorderImageView.bounds) + kEditingControlAppearanceOffset
           : 0.f;
 
+  CGFloat accessoryViewPadding =
+      _accessoryView ? CGRectGetWidth(self.bounds) - CGRectGetMinX(_accessoryView.frame) : 0;
   CGFloat trailingPadding =
       _attr.shouldShowSelectorStateMask
           ? CGRectGetWidth(_editingSelectorImageView.bounds) + kEditingControlAppearanceOffset
-          : 0.f;
+          : accessoryViewPadding;
   UIEdgeInsets insets = MDCInsetsMakeWithLayoutDirection(
       0, leadingPadding, 0, trailingPadding, self.mdc_effectiveUserInterfaceLayoutDirection);
   return UIEdgeInsetsInsetRect(self.bounds, insets);
diff --git a/components/CollectionCells/src/MDCCollectionViewTextCell.m b/components/CollectionCells/src/MDCCollectionViewTextCell.m
index 9fd09ad96fb..6e6d6927a3d 100644
--- a/components/CollectionCells/src/MDCCollectionViewTextCell.m
+++ b/components/CollectionCells/src/MDCCollectionViewTextCell.m
@@ -126,9 +126,6 @@ - (CGRect)contentWrapperFrame {
   CGFloat leadingPadding =
       _imageView.image ? kCellTextWithImagePaddingLeading : kCellTextNoImagePaddingLeading;
   CGFloat trailingPadding = kCellTextNoImagePaddingTrailing;
-  if (self.accessoryView && !self.isEditing) {
-    trailingPadding += CGRectGetWidth(self.accessoryView.bounds) + kCellTextNoImagePaddingTrailing;
-  }
   UIEdgeInsets insets = MDCInsetsMakeWithLayoutDirection(
       0, leadingPadding, 0, trailingPadding, self.mdc_effectiveUserInterfaceLayoutDirection);
   return UIEdgeInsetsInsetRect(self.contentView.bounds, insets);
diff --git a/components/Slider/examples/SliderTypicalUse.m b/components/Slider/examples/SliderTypicalUse.m
index cb253908a15..47f5a0aea73 100644
--- a/components/Slider/examples/SliderTypicalUse.m
+++ b/components/Slider/examples/SliderTypicalUse.m
@@ -35,6 +35,15 @@ - (void)viewDidLoad {
         forControlEvents:UIControlEventValueChanged];
   [self.view addSubview:self.slider];
 
+  // Discrete slider
+
+  self.discreteSlider = [[MDCSlider alloc] initWithFrame:sliderFrame];
+  self.discreteSlider.numberOfDiscreteValues = 5;
+  [self.discreteSlider addTarget:self
+                          action:@selector(didChangeSliderValue:)
+                forControlEvents:UIControlEventValueChanged];
+  [self.view addSubview:self.discreteSlider];
+
   // Slider disabled
 
   self.disabledSlider = [[MDCSlider alloc] initWithFrame:sliderFrame];
@@ -46,6 +55,7 @@ - (void)viewDidLoad {
   [self.view addSubview:self.disabledSlider];
 
   self.slider.translatesAutoresizingMaskIntoConstraints = NO;
+  self.discreteSlider.translatesAutoresizingMaskIntoConstraints = NO;
   self.disabledSlider.translatesAutoresizingMaskIntoConstraints = NO;
 
   [self setupExampleViews];
diff --git a/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.h b/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.h
index a7d2bfca209..48325c80348 100644
--- a/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.h
+++ b/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.h
@@ -11,6 +11,7 @@
 @interface SliderTypicalUseViewController : UIViewController
 
 @property(nonatomic) MDCSlider *slider;
+@property(nonatomic) MDCSlider *discreteSlider;
 @property(nonatomic) MDCSlider *disabledSlider;
 
 @end
diff --git a/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.m b/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.m
index d109f37a0df..6ac933bbe22 100644
--- a/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.m
+++ b/components/Slider/examples/supplemental/SliderTypicalUseSupplemental.m
@@ -39,6 +39,14 @@ - (void)setupExampleViews {
   sliderLabel.translatesAutoresizingMaskIntoConstraints = NO;
   [self.view addSubview:sliderLabel];
 
+  UILabel *discreteSliderLabel = [[UILabel alloc] init];
+  discreteSliderLabel.text = @"Discrete Slider";
+  discreteSliderLabel.font = [MDCTypography captionFont];
+  discreteSliderLabel.alpha = [MDCTypography captionFontOpacity];
+  [discreteSliderLabel sizeToFit];
+  discreteSliderLabel.translatesAutoresizingMaskIntoConstraints = NO;
+  [self.view addSubview:discreteSliderLabel];
+
   UILabel *disabledSliderLabel = [[UILabel alloc] init];
   disabledSliderLabel.text = @"Slider Disabled";
   disabledSliderLabel.font = [MDCTypography captionFont];
@@ -50,6 +58,8 @@ - (void)setupExampleViews {
   NSDictionary *views = @{
     @"slider" : self.slider,
     @"label" : sliderLabel,
+    @"discreteSlider" : self.discreteSlider,
+    @"discreteSliderLabel" : discreteSliderLabel,
     @"disabledSlider" : self.disabledSlider,
     @"disabledSliderLabel" : disabledSliderLabel
   };
@@ -62,11 +72,13 @@ - (void)setupExampleViews {
   };
 
   // Vertical column of sliders
-  NSString *sliderLayoutConstraints = @"V:[slider]-smallVMargin-[disabledSlider]";
+  NSString *sliderLayoutConstraints =
+      @"V:[slider]-smallVMargin-[discreteSlider]-smallVMargin-[disabledSlider]";
 
   // Vertical column of labels
-  NSString *labelLayoutConstraints =
-      @"V:[label(sliderHeight)]-smallVMargin-[disabledSliderLabel(sliderHeight)]";
+  NSString *labelLayoutConstraints = @"V:[label(sliderHeight)]-smallVMargin-[discreteSliderLabel("
+                                     @"sliderHeight)]-smallVMargin-[disabledSliderLabel("
+                                     @"sliderHeight)]";
 
   // Horizontal alignment between the two columns
   NSString *columnConstraints = @"[label(100)]-smallHMargin-[slider]";
diff --git a/components/Slider/src/MDCSlider.m b/components/Slider/src/MDCSlider.m
index 04be5db98df..704ee198c35 100644
--- a/components/Slider/src/MDCSlider.m
+++ b/components/Slider/src/MDCSlider.m
@@ -72,6 +72,7 @@ - (void)commonMDCSliderInit {
   _thumbTrack.thumbIsHollowAtStart = YES;
   _thumbTrack.thumbGrowsWhenDragging = YES;
   _thumbTrack.shouldDisplayInk = NO;
+  _thumbTrack.shouldDisplayDiscreteDots = YES;
   _thumbTrack.trackOffColor = [[self class] defaultTrackOffColor];
   _thumbTrack.thumbDisabledColor = [[self class] defaultDisabledColor];
   _thumbTrack.trackDisabledColor = [[self class] defaultDisabledColor];
diff --git a/components/Snackbar/src/MDCSnackbarManager.h b/components/Snackbar/src/MDCSnackbarManager.h
index afdacdfc807..0118abdf299 100644
--- a/components/Snackbar/src/MDCSnackbarManager.h
+++ b/components/Snackbar/src/MDCSnackbarManager.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKIt.h>
 
 @class MDCSnackbarMessage;
diff --git a/components/Snackbar/src/MDCSnackbarManager.m b/components/Snackbar/src/MDCSnackbarManager.m
index a9ebee78820..5acc84004ff 100644
--- a/components/Snackbar/src/MDCSnackbarManager.m
+++ b/components/Snackbar/src/MDCSnackbarManager.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCSnackbarManager.h"
 #import "MDCSnackbarMessage.h"
 #import "MaterialOverlayWindow.h"
diff --git a/components/Snackbar/src/MDCSnackbarMessage.h b/components/Snackbar/src/MDCSnackbarMessage.h
index 1481112c74c..cf61bb8f418 100644
--- a/components/Snackbar/src/MDCSnackbarMessage.h
+++ b/components/Snackbar/src/MDCSnackbarMessage.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 @class MDCSnackbarMessageAction;
diff --git a/components/Snackbar/src/MDCSnackbarMessage.m b/components/Snackbar/src/MDCSnackbarMessage.m
index c65068d85b7..a8e7f6df93f 100644
--- a/components/Snackbar/src/MDCSnackbarMessage.m
+++ b/components/Snackbar/src/MDCSnackbarMessage.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCSnackbarMessage.h"
 #import "private/MDCSnackbarMessageInternal.h"
 #import "private/MDCSnackbarMessageView.h"
diff --git a/components/Snackbar/src/MaterialSnackbar.h b/components/Snackbar/src/MaterialSnackbar.h
index b5447ac1abd..1c687003e9e 100644
--- a/components/Snackbar/src/MaterialSnackbar.h
+++ b/components/Snackbar/src/MaterialSnackbar.h
@@ -1,2 +1,18 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCSnackbarManager.h"
 #import "MDCSnackbarMessage.h"
diff --git a/components/Snackbar/src/private/MDCSnackbarMessageInternal.h b/components/Snackbar/src/private/MDCSnackbarMessageInternal.h
index 08162008b3b..1c674ecea0f 100644
--- a/components/Snackbar/src/private/MDCSnackbarMessageInternal.h
+++ b/components/Snackbar/src/private/MDCSnackbarMessageInternal.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCSnackbarMessage.h"
 
 /**
diff --git a/components/Snackbar/src/private/MDCSnackbarMessageView.h b/components/Snackbar/src/private/MDCSnackbarMessageView.h
index d8bdccf2158..d722e2c4028 100644
--- a/components/Snackbar/src/private/MDCSnackbarMessageView.h
+++ b/components/Snackbar/src/private/MDCSnackbarMessageView.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 @class MDCSnackbarMessage;
diff --git a/components/Snackbar/src/private/MDCSnackbarMessageView.m b/components/Snackbar/src/private/MDCSnackbarMessageView.m
index b63bd72598c..2172f3b41f2 100644
--- a/components/Snackbar/src/private/MDCSnackbarMessageView.m
+++ b/components/Snackbar/src/private/MDCSnackbarMessageView.m
@@ -4,6 +4,22 @@
 #import "MDCSnackbarMessageView.h"
 
 #import "MaterialButtons.h"
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MaterialTypography.h"
 
 NSString *const MDCSnackbarMessageTitleAutomationIdentifier =
@@ -348,13 +364,11 @@ - (instancetype)initWithMessage:(MDCSnackbarMessage *)message
       [buttonView addSubview:button];
 
       // Style the text in the button.
-      NSString *uppercaseButtonText =
-          [message.action.title uppercaseStringWithLocale:[NSLocale currentLocale]];
       NSAttributedString *buttonText =
-          [[NSAttributedString alloc] initWithString:uppercaseButtonText
+          [[NSAttributedString alloc] initWithString:message.action.title
                                           attributes:buttonAttributes];
       NSAttributedString *buttonHighlightedText =
-          [[NSAttributedString alloc] initWithString:uppercaseButtonText
+          [[NSAttributedString alloc] initWithString:message.action.title
                                           attributes:buttonHighlightedAttributes];
       button.titleLabel.numberOfLines = 1;
       button.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
diff --git a/components/Snackbar/src/private/MDCSnackbarOverlayView.h b/components/Snackbar/src/private/MDCSnackbarOverlayView.h
index 28aaaa70571..09c932adc03 100644
--- a/components/Snackbar/src/private/MDCSnackbarOverlayView.h
+++ b/components/Snackbar/src/private/MDCSnackbarOverlayView.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 @class MDCSnackbarMessageView;
diff --git a/components/Snackbar/src/private/MDCSnackbarOverlayView.m b/components/Snackbar/src/private/MDCSnackbarOverlayView.m
index fcfaff91481..2c3f9cc43ef 100644
--- a/components/Snackbar/src/private/MDCSnackbarOverlayView.m
+++ b/components/Snackbar/src/private/MDCSnackbarOverlayView.m
@@ -1,6 +1,23 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCSnackbarOverlayView.h"
-#import "MDCKeyboardWatcher.h"
 #import "MDCSnackbarMessageView.h"
+
+#import "MaterialKeyboardWatcher.h"
 #import "MaterialOverlays.h"
 
 NSString *const MDCSnackbarOverlayIdentifier = @"MDCSnackbar";
diff --git a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h
index beb27fdb964..d207745f95a 100644
--- a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h
+++ b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
diff --git a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.m b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.m
index 8413411b8e6..1d321f32c82 100644
--- a/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.m
+++ b/components/private/KeyboardWatcher/src/MDCKeyboardWatcher.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCKeyboardWatcher.h"
 
 NSString *const MDCKeyboardWatcherKeyboardWillShowNotification =
diff --git a/components/private/KeyboardWatcher/src/MaterialKeyboardWatcher.h b/components/private/KeyboardWatcher/src/MaterialKeyboardWatcher.h
new file mode 100644
index 00000000000..4fd777d1553
--- /dev/null
+++ b/components/private/KeyboardWatcher/src/MaterialKeyboardWatcher.h
@@ -0,0 +1,17 @@
+/*
+ Copyright 2015-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MDCKeyboardWatcher.h"
diff --git a/components/private/Overlay/src/MDCOverlayImplementor.h b/components/private/Overlay/src/MDCOverlayImplementor.h
index f41aca7d57f..21087113714 100644
--- a/components/private/Overlay/src/MDCOverlayImplementor.h
+++ b/components/private/Overlay/src/MDCOverlayImplementor.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <Foundation/Foundation.h>
 
 /**
diff --git a/components/private/Overlay/src/MDCOverlayObserver.h b/components/private/Overlay/src/MDCOverlayObserver.h
index c309ae9d7d0..8eaa260f423 100644
--- a/components/private/Overlay/src/MDCOverlayObserver.h
+++ b/components/private/Overlay/src/MDCOverlayObserver.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 /**
diff --git a/components/private/Overlay/src/MDCOverlayObserver.m b/components/private/Overlay/src/MDCOverlayObserver.m
index 2a7bb64d1ff..01759e81185 100644
--- a/components/private/Overlay/src/MDCOverlayObserver.m
+++ b/components/private/Overlay/src/MDCOverlayObserver.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCOverlayObserver.h"
 
 #import <CoreFoundation/CoreFoundation.h>
diff --git a/components/private/Overlay/src/MDCOverlayTransitioning.h b/components/private/Overlay/src/MDCOverlayTransitioning.h
index 2a7a1818e76..ed579a7bc3a 100644
--- a/components/private/Overlay/src/MDCOverlayTransitioning.h
+++ b/components/private/Overlay/src/MDCOverlayTransitioning.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 /**
diff --git a/components/private/Overlay/src/MaterialOverlays.h b/components/private/Overlay/src/MaterialOverlays.h
index 14d72895cf2..ea8d53817fe 100644
--- a/components/private/Overlay/src/MaterialOverlays.h
+++ b/components/private/Overlay/src/MaterialOverlays.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <Availability.h>
 #import <Foundation/Foundation.h>
 
diff --git a/components/private/Overlay/src/private/MDCOverlayAnimationObserver.h b/components/private/Overlay/src/private/MDCOverlayAnimationObserver.h
index d1c1a483ac4..0b3ae88efd9 100644
--- a/components/private/Overlay/src/private/MDCOverlayAnimationObserver.h
+++ b/components/private/Overlay/src/private/MDCOverlayAnimationObserver.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <Foundation/Foundation.h>
 
 @protocol MDCOverlayAnimationObserverDelegate;
diff --git a/components/private/Overlay/src/private/MDCOverlayAnimationObserver.m b/components/private/Overlay/src/private/MDCOverlayAnimationObserver.m
index 1258dae71bf..3a94253ea7e 100644
--- a/components/private/Overlay/src/private/MDCOverlayAnimationObserver.m
+++ b/components/private/Overlay/src/private/MDCOverlayAnimationObserver.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCOverlayAnimationObserver.h"
 
 @interface MDCOverlayAnimationObserver () {
diff --git a/components/private/Overlay/src/private/MDCOverlayObserverOverlay.h b/components/private/Overlay/src/private/MDCOverlayObserverOverlay.h
index 58111dec726..50896ce2633 100644
--- a/components/private/Overlay/src/private/MDCOverlayObserverOverlay.h
+++ b/components/private/Overlay/src/private/MDCOverlayObserverOverlay.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 #import "MDCOverlayTransitioning.h"
diff --git a/components/private/Overlay/src/private/MDCOverlayObserverOverlay.m b/components/private/Overlay/src/private/MDCOverlayObserverOverlay.m
index 1b3cdf3efed..82ed1557b75 100644
--- a/components/private/Overlay/src/private/MDCOverlayObserverOverlay.m
+++ b/components/private/Overlay/src/private/MDCOverlayObserverOverlay.m
@@ -1,5 +1,20 @@
-#import "MDCOverlayObserverOverlay.h"
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MDCOverlayObserverOverlay.h"
 #import "MDCOverlayUtilities.h"
 
 @implementation MDCOverlayObserverOverlay
diff --git a/components/private/Overlay/src/private/MDCOverlayObserverTransition.h b/components/private/Overlay/src/private/MDCOverlayObserverTransition.h
index ab9473bc178..b0a2b919a86 100644
--- a/components/private/Overlay/src/private/MDCOverlayObserverTransition.h
+++ b/components/private/Overlay/src/private/MDCOverlayObserverTransition.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 #import "MDCOverlayTransitioning.h"
diff --git a/components/private/Overlay/src/private/MDCOverlayObserverTransition.m b/components/private/Overlay/src/private/MDCOverlayObserverTransition.m
index 0aa4ab08a74..73798ae1363 100644
--- a/components/private/Overlay/src/private/MDCOverlayObserverTransition.m
+++ b/components/private/Overlay/src/private/MDCOverlayObserverTransition.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCOverlayObserverTransition.h"
 
 #import "MDCOverlayObserverOverlay.h"
diff --git a/components/private/Overlay/src/private/MDCOverlayUtilities.h b/components/private/Overlay/src/private/MDCOverlayUtilities.h
index 26d32e7722b..1c443eaf44e 100644
--- a/components/private/Overlay/src/private/MDCOverlayUtilities.h
+++ b/components/private/Overlay/src/private/MDCOverlayUtilities.h
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import <UIKit/UIKit.h>
 
 /**
diff --git a/components/private/Overlay/src/private/MDCOverlayUtilities.m b/components/private/Overlay/src/private/MDCOverlayUtilities.m
index 3358e0f3a89..aee8d6a30a7 100644
--- a/components/private/Overlay/src/private/MDCOverlayUtilities.m
+++ b/components/private/Overlay/src/private/MDCOverlayUtilities.m
@@ -1,3 +1,19 @@
+/*
+ Copyright 2016-present Google Inc. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
 #import "MDCOverlayUtilities.h"
 
 CGRect MDCOverlayConvertRectToView(CGRect screenRect, UIView *target) {
diff --git a/components/private/ThumbTrack/src/MDCThumbTrack.h b/components/private/ThumbTrack/src/MDCThumbTrack.h
index 9fb129e9a14..83c66a922ce 100644
--- a/components/private/ThumbTrack/src/MDCThumbTrack.h
+++ b/components/private/ThumbTrack/src/MDCThumbTrack.h
@@ -111,6 +111,9 @@
 /** Whether the thumb should display ink splashes on touch. */
 @property(nonatomic, assign) BOOL shouldDisplayInk;
 
+/** Whether or not to display dots indicating discrete locations. Default is NO. */
+@property(nonatomic, assign) BOOL shouldDisplayDiscreteDots;
+
 /** Whether a disabled thumb track includes gaps on either side of the thumb. The default is NO. */
 @property(nonatomic, assign) BOOL disabledTrackHasThumbGaps;
 
diff --git a/components/private/ThumbTrack/src/MDCThumbTrack.m b/components/private/ThumbTrack/src/MDCThumbTrack.m
index 8b687d290bb..2004768b558 100644
--- a/components/private/ThumbTrack/src/MDCThumbTrack.m
+++ b/components/private/ThumbTrack/src/MDCThumbTrack.m
@@ -30,6 +30,47 @@
 static const CGFloat kMinTouchSize = 48.0f;
 static const CGFloat kThumbSlopFactor = 3.5f;
 
+// Credit to the Beacon Tools iOS team for the idea for this implementations
+@interface MDCDiscreteDotView : UIView
+
+@property(nonatomic, assign) NSUInteger numDiscreteDots;
+
+@end
+
+@implementation MDCDiscreteDotView
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    self.backgroundColor = [UIColor clearColor];
+  }
+  return self;
+}
+
+- (void)drawRect:(CGRect)rect {
+  [super drawRect:rect];
+
+  if (_numDiscreteDots >= 2) {
+    CGContextRef contextRef = UIGraphicsGetCurrentContext();
+    CGContextSetFillColorWithColor(contextRef, [UIColor blackColor].CGColor);
+
+    CGRect circleRect = CGRectMake(0, 0, self.bounds.size.height, self.bounds.size.height);
+    CGFloat increment = (self.bounds.size.width - self.bounds.size.height) / (_numDiscreteDots - 1);
+
+    for (NSUInteger i = 0; i < _numDiscreteDots; i++) {
+      circleRect.origin.x = (i * increment);
+      CGContextFillEllipseInRect(contextRef, circleRect);
+    }
+  }
+}
+
+- (void)setNumDiscreteDots:(NSUInteger)numDiscreteDots {
+  _numDiscreteDots = numDiscreteDots;
+  [self setNeedsDisplay];
+}
+
+@end
+
 // TODO(iangordon): Properly handle broken tgmath
 static inline CGFloat CGFabs(CGFloat value) {
 #if CGFLOAT_IS_DOUBLE
@@ -82,7 +123,6 @@ @interface MDCThumbTrack () <MDCInkTouchControllerDelegate>
 @end
 
 @implementation MDCThumbTrack {
-  CGFloat _panThumbGrabPosition;
   CGFloat _lastDispatchedValue;
   UIColor *_thumbOnColor;
   UIColor *_trackOnColor;
@@ -91,11 +131,16 @@ @implementation MDCThumbTrack {
   UIView *_trackView;
   CAShapeLayer *_trackMaskLayer;
   CALayer *_trackOnLayer;
-  BOOL _isTouchDown;
+  MDCDiscreteDotView *_discreteDots;
+  BOOL _shouldDisplayInk;
+
+  // Attributes to handle interaction. To associate touches to previous touches, we keep a reference
+  // to the current touch, since the system reuses the same memory address when sending subsequent
+  // touches for the same gesture. If _currentTouch == nil, then there's no interaction going on.
+  UITouch *_currentTouch;
   BOOL _isDraggingThumb;
-  CGPoint _lastTouchPoint;
   BOOL _didChangeValueDuringPan;
-  BOOL _shouldDisplayInk;
+  CGFloat _panThumbGrabPosition;
 }
 
 // TODO(iangordon): ThumbView is not respecting the bounds of ThumbTrack
@@ -129,8 +174,10 @@ - (instancetype)initWithFrame:(CGRect)frame onTintColor:(UIColor *)onTintColor {
     _trackMaskLayer = [CAShapeLayer layer];
     _trackMaskLayer.fillRule = kCAFillRuleEvenOdd;
     _trackView.layer.mask = _trackMaskLayer;
+
     _trackOnLayer = [CALayer layer];
     [_trackView.layer addSublayer:_trackOnLayer];
+
     [self addSubview:_trackView];
 
     // Set up ink layer.
@@ -210,6 +257,20 @@ - (void)setInterpolateOnOffColors:(BOOL)interpolateOnOffColors {
   [self setPrimaryColor:_primaryColor];
 }
 
+- (void)setShouldDisplayDiscreteDots:(BOOL)shouldDisplayDiscreteDots {
+  if (_shouldDisplayDiscreteDots != shouldDisplayDiscreteDots) {
+    if (shouldDisplayDiscreteDots) {
+      _discreteDots = [[MDCDiscreteDotView alloc] init];
+      _discreteDots.alpha = 0.0;
+      [_trackView addSubview:_discreteDots];
+    } else {
+      [_discreteDots removeFromSuperview];
+      _discreteDots = nil;
+    }
+    _shouldDisplayDiscreteDots = shouldDisplayDiscreteDots;
+  }
+}
+
 - (void)setMinimumValue:(CGFloat)minimumValue {
   _minimumValue = MIN(_maximumValue, minimumValue);
   CGFloat previousValue = _value;
@@ -287,6 +348,7 @@ - (void)setValue:(CGFloat)value
 
 - (void)setNumDiscreteValues:(NSUInteger)numDiscreteValues {
   _numDiscreteValues = numDiscreteValues;
+  _discreteDots.numDiscreteDots = numDiscreteValues;
   [self setValue:_value];
 }
 
@@ -568,6 +630,9 @@ - (void)updateViewsMainIsAnimated:(BOOL)animated
                                   CGRectGetWidth(self.bounds), _trackHeight);
   }
 
+  // Make sure discrete dots match up
+  _discreteDots.frame = [_trackView bounds];
+
   // Update colors, etc.
   if (self.enabled) {
     if (_thumbIsSmallerWhenDisabled) {
@@ -575,7 +640,7 @@ - (void)updateViewsMainIsAnimated:(BOOL)animated
     }
 
     if (!_interpolateOnOffColors) {
-      _trackView.layer.backgroundColor = _trackOffColor.CGColor;
+      _trackView.backgroundColor = _trackOffColor;
       _trackOnLayer.backgroundColor = _trackOnColor.CGColor;
 
       CGFloat anchorXValue = [self trackPositionForValue:_filledTrackAnchorValue].x;
@@ -614,6 +679,14 @@ - (void)updateViewsMainIsAnimated:(BOOL)animated
  */
 - (void)updateViewsForThumbAfterMoveIsAnimated:(BOOL)animated
                                   withDuration:(NSTimeInterval)duration {
+  if (_shouldDisplayDiscreteDots) {
+    if (self.enabled && _isDraggingThumb) {
+      _discreteDots.alpha = 1.0;
+    } else {
+      _discreteDots.alpha = 0.0;
+    }
+  }
+
   if (!self.enabled) {
     // The following changes only matter if the track is enabled.
     return;
@@ -747,14 +820,14 @@ - (CGFloat)closestValueToTargetValue:(CGFloat)targetValue {
  */
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
-  if (!self.enabled || _isTouchDown) {
+  if (!self.enabled || _currentTouch != nil) {
     return;
   }
 
+  UITouch *touch = [touches anyObject];
   CGPoint touchLoc = [[touches anyObject] locationInView:self];
 
-  _isTouchDown = YES;
-  _lastTouchPoint = touchLoc;
+  _currentTouch = touch;
   _didChangeValueDuringPan = NO;
 
   _isDraggingThumb = _panningAllowedOnEntireControl || [self isPointOnThumb:touchLoc];
@@ -775,18 +848,16 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
 
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   UITouch *touch = [touches anyObject];
-  if (!self.enabled || ![self isTouchRelevant:touch]) {
+  if (!self.enabled || touch != _currentTouch) {
     return;
   }
 
-  CGPoint touchLoc = [touch locationInView:self];
-  _lastTouchPoint = touchLoc;
-
   if (!_isDraggingThumb) {
     // The rest is dragging logic
     return;
   }
 
+  CGPoint touchLoc = [touch locationInView:self];
   CGFloat thumbPosition = touchLoc.x - _panThumbGrabPosition;
   CGFloat previousValue = _value;
   CGFloat value = [self valueForThumbPosition:CGPointMake(thumbPosition, 0)];
@@ -808,21 +879,28 @@ - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
 
 - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   UITouch *touch = [touches anyObject];
-  if ([self isTouchRelevant:touch]) {
-    _isTouchDown = _isDraggingThumb = NO;
+  if (touch == _currentTouch) {
+    BOOL wasDragging = _isDraggingThumb;
+    _isDraggingThumb = NO;
+    _currentTouch = nil;
 
     [self sendActionsForControlEvents:UIControlEventTouchCancel];
+
+    if (!_continuousUpdateEvents && wasDragging) {
+      [self sendDiscreteChangeAction];
+    }
   }
 }
 
 - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   UITouch *touch = [touches anyObject];
-  if (!self.enabled || ![self isTouchRelevant:touch]) {
+  if (!self.enabled || touch != _currentTouch) {
     return;
   }
 
   BOOL wasDragging = _isDraggingThumb;
-  _isTouchDown = _isDraggingThumb = NO;
+  _isDraggingThumb = NO;
+  _currentTouch = nil;
 
   if (wasDragging) {
     // Shrink the thumb
@@ -847,16 +925,10 @@ - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   } else {
     [self sendActionsForControlEvents:UIControlEventTouchUpOutside];
   }
-}
 
-- (BOOL)isTouchRelevant:(UITouch *)touch {
-  // We compare the previous position vs. current position rather than saving and comparing UITouch
-  // objects per Apple's documentation in UITouch, which says: "Never retain a touch object when
-  // handling an event. If you need to keep information about a touch from one touch phase to
-  // another, copy that information from the touch."
-  // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UITouch_Class/
-  return CGPointEqualToPoint(_lastTouchPoint, [touch previousLocationInView:self]) ||
-         CGPointEqualToPoint(_lastTouchPoint, [touch locationInView:self]);
+  if (!_continuousUpdateEvents && wasDragging) {
+    [self sendDiscreteChangeAction];
+  }
 }
 
 - (BOOL)isPointOnThumb:(CGPoint)point {
diff --git a/demos/Pesto/Pesto.xcodeproj/project.pbxproj b/demos/Pesto/Pesto.xcodeproj/project.pbxproj
index 6e3e4402e33..266665b7ab1 100644
--- a/demos/Pesto/Pesto.xcodeproj/project.pbxproj
+++ b/demos/Pesto/Pesto.xcodeproj/project.pbxproj
@@ -210,12 +210,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DEBEDF3B1C3EF5D5004B614B /* Build configuration list for PBXNativeTarget "Pesto" */;
 			buildPhases = (
-				F647DB44E4F3B46B31211A92 /* 📦 Check Pods Manifest.lock */,
+				F647DB44E4F3B46B31211A92 /* [CP] Check Pods Manifest.lock */,
 				DEBEDF201C3EF5D5004B614B /* Sources */,
 				DEBEDF211C3EF5D5004B614B /* Frameworks */,
 				DEBEDF221C3EF5D5004B614B /* Resources */,
-				38D213EC5110261D08DB1CFC /* 📦 Embed Pods Frameworks */,
-				F349B3654BA8D36A2345FF6D /* 📦 Copy Pods Resources */,
+				38D213EC5110261D08DB1CFC /* [CP] Embed Pods Frameworks */,
+				F349B3654BA8D36A2345FF6D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -271,14 +271,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		38D213EC5110261D08DB1CFC /* 📦 Embed Pods Frameworks */ = {
+		38D213EC5110261D08DB1CFC /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -286,14 +286,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pesto/Pods-Pesto-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F349B3654BA8D36A2345FF6D /* 📦 Copy Pods Resources */ = {
+		F349B3654BA8D36A2345FF6D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -301,14 +301,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pesto/Pods-Pesto-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F647DB44E4F3B46B31211A92 /* 📦 Check Pods Manifest.lock */ = {
+		F647DB44E4F3B46B31211A92 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock
index 3debc4abab3..cd50adfe453 100644
--- a/demos/Pesto/Podfile.lock
+++ b/demos/Pesto/Podfile.lock
@@ -1,31 +1,31 @@
 PODS:
-  - MaterialComponents (12.0.0):
-    - MaterialComponents/ActivityIndicator (= 12.0.0)
-    - MaterialComponents/AppBar (= 12.0.0)
-    - MaterialComponents/ButtonBar (= 12.0.0)
-    - MaterialComponents/Buttons (= 12.0.0)
-    - MaterialComponents/CollectionCells (= 12.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 12.0.0)
-    - MaterialComponents/Collections (= 12.0.0)
-    - MaterialComponents/FlexibleHeader (= 12.0.0)
-    - MaterialComponents/FontDiskLoader (= 12.0.0)
-    - MaterialComponents/HeaderStackView (= 12.0.0)
-    - MaterialComponents/Ink (= 12.0.0)
-    - MaterialComponents/NavigationBar (= 12.0.0)
-    - MaterialComponents/OverlayWindow (= 12.0.0)
-    - MaterialComponents/PageControl (= 12.0.0)
-    - MaterialComponents/Palettes (= 12.0.0)
-    - MaterialComponents/private (= 12.0.0)
-    - MaterialComponents/RobotoFontLoader (= 12.0.0)
-    - MaterialComponents/ShadowElevations (= 12.0.0)
-    - MaterialComponents/ShadowLayer (= 12.0.0)
-    - MaterialComponents/Slider (= 12.0.0)
-    - MaterialComponents/Snackbar (= 12.0.0)
-    - MaterialComponents/SpritedAnimationView (= 12.0.0)
-    - MaterialComponents/Switch (= 12.0.0)
-    - MaterialComponents/Typography (= 12.0.0)
-  - MaterialComponents/ActivityIndicator (12.0.0)
-  - MaterialComponents/AppBar (12.0.0):
+  - MaterialComponents (12.0.1):
+    - MaterialComponents/ActivityIndicator (= 12.0.1)
+    - MaterialComponents/AppBar (= 12.0.1)
+    - MaterialComponents/ButtonBar (= 12.0.1)
+    - MaterialComponents/Buttons (= 12.0.1)
+    - MaterialComponents/CollectionCells (= 12.0.1)
+    - MaterialComponents/CollectionLayoutAttributes (= 12.0.1)
+    - MaterialComponents/Collections (= 12.0.1)
+    - MaterialComponents/FlexibleHeader (= 12.0.1)
+    - MaterialComponents/FontDiskLoader (= 12.0.1)
+    - MaterialComponents/HeaderStackView (= 12.0.1)
+    - MaterialComponents/Ink (= 12.0.1)
+    - MaterialComponents/NavigationBar (= 12.0.1)
+    - MaterialComponents/OverlayWindow (= 12.0.1)
+    - MaterialComponents/PageControl (= 12.0.1)
+    - MaterialComponents/Palettes (= 12.0.1)
+    - MaterialComponents/private (= 12.0.1)
+    - MaterialComponents/RobotoFontLoader (= 12.0.1)
+    - MaterialComponents/ShadowElevations (= 12.0.1)
+    - MaterialComponents/ShadowLayer (= 12.0.1)
+    - MaterialComponents/Slider (= 12.0.1)
+    - MaterialComponents/Snackbar (= 12.0.1)
+    - MaterialComponents/SpritedAnimationView (= 12.0.1)
+    - MaterialComponents/Switch (= 12.0.1)
+    - MaterialComponents/Typography (= 12.0.1)
+  - MaterialComponents/ActivityIndicator (12.0.1)
+  - MaterialComponents/AppBar (12.0.1):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -34,15 +34,15 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (12.0.0):
+  - MaterialComponents/ButtonBar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (12.0.0):
+  - MaterialComponents/Buttons (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionCells (12.0.0):
+  - MaterialComponents/CollectionCells (12.0.1):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -53,81 +53,81 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (12.0.0)
-  - MaterialComponents/Collections (12.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (12.0.1)
+  - MaterialComponents/Collections (12.0.1):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/FlexibleHeader (12.0.0)
-  - MaterialComponents/FontDiskLoader (12.0.0)
-  - MaterialComponents/HeaderStackView (12.0.0)
-  - MaterialComponents/Ink (12.0.0)
-  - MaterialComponents/NavigationBar (12.0.0):
+  - MaterialComponents/FlexibleHeader (12.0.1)
+  - MaterialComponents/FontDiskLoader (12.0.1)
+  - MaterialComponents/HeaderStackView (12.0.1)
+  - MaterialComponents/Ink (12.0.1)
+  - MaterialComponents/NavigationBar (12.0.1):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (12.0.0)
-  - MaterialComponents/PageControl (12.0.0)
-  - MaterialComponents/Palettes (12.0.0)
-  - MaterialComponents/private (12.0.0):
-    - MaterialComponents/private/Color (= 12.0.0)
-    - MaterialComponents/private/Icons (= 12.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 12.0.0)
-    - MaterialComponents/private/Overlay (= 12.0.0)
-    - MaterialComponents/private/RTL (= 12.0.0)
-    - MaterialComponents/private/ThumbTrack (= 12.0.0)
-  - MaterialComponents/private/Color (12.0.0)
-  - MaterialComponents/private/Icons (12.0.0):
-    - MaterialComponents/private/Icons/Base (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 12.0.0)
-  - MaterialComponents/private/Icons/Base (12.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (12.0.0):
+  - MaterialComponents/OverlayWindow (12.0.1)
+  - MaterialComponents/PageControl (12.0.1)
+  - MaterialComponents/Palettes (12.0.1)
+  - MaterialComponents/private (12.0.1):
+    - MaterialComponents/private/Color (= 12.0.1)
+    - MaterialComponents/private/Icons (= 12.0.1)
+    - MaterialComponents/private/KeyboardWatcher (= 12.0.1)
+    - MaterialComponents/private/Overlay (= 12.0.1)
+    - MaterialComponents/private/RTL (= 12.0.1)
+    - MaterialComponents/private/ThumbTrack (= 12.0.1)
+  - MaterialComponents/private/Color (12.0.1)
+  - MaterialComponents/private/Icons (12.0.1):
+    - MaterialComponents/private/Icons/Base (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_info (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_reorder (= 12.0.1)
+  - MaterialComponents/private/Icons/Base (12.0.1)
+  - MaterialComponents/private/Icons/ic_arrow_back (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (12.0.0):
+  - MaterialComponents/private/Icons/ic_check (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (12.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (12.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (12.0.0):
+  - MaterialComponents/private/Icons/ic_info (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (12.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (12.0.0)
-  - MaterialComponents/private/Overlay (12.0.0)
-  - MaterialComponents/private/RTL (12.0.0)
-  - MaterialComponents/private/ThumbTrack (12.0.0):
+  - MaterialComponents/private/KeyboardWatcher (12.0.1)
+  - MaterialComponents/private/Overlay (12.0.1)
+  - MaterialComponents/private/RTL (12.0.1)
+  - MaterialComponents/private/ThumbTrack (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/RobotoFontLoader (12.0.0):
+  - MaterialComponents/RobotoFontLoader (12.0.1):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (12.0.0)
-  - MaterialComponents/ShadowLayer (12.0.0)
-  - MaterialComponents/Slider (12.0.0):
+  - MaterialComponents/ShadowElevations (12.0.1)
+  - MaterialComponents/ShadowLayer (12.0.1)
+  - MaterialComponents/Slider (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (12.0.0):
+  - MaterialComponents/Snackbar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (12.0.0)
-  - MaterialComponents/Switch (12.0.0):
+  - MaterialComponents/SpritedAnimationView (12.0.1)
+  - MaterialComponents/Switch (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (12.0.0)
+  - MaterialComponents/Typography (12.0.1)
 
 DEPENDENCIES:
   - MaterialComponents (from `../../`)
@@ -137,8 +137,8 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  MaterialComponents: da64cae6db6bef2d7d1c80e10a3c71a18b07bb76
+  MaterialComponents: c9194c49be10b8ac59cb8f857bedecbb511705a8
 
 PODFILE CHECKSUM: f138be16d4835113ff672258fc7529fad3f90e91
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1
diff --git a/demos/Shrine/Podfile.lock b/demos/Shrine/Podfile.lock
index dc263f611ef..e302c154727 100644
--- a/demos/Shrine/Podfile.lock
+++ b/demos/Shrine/Podfile.lock
@@ -1,31 +1,31 @@
 PODS:
-  - MaterialComponents (12.0.0):
-    - MaterialComponents/ActivityIndicator (= 12.0.0)
-    - MaterialComponents/AppBar (= 12.0.0)
-    - MaterialComponents/ButtonBar (= 12.0.0)
-    - MaterialComponents/Buttons (= 12.0.0)
-    - MaterialComponents/CollectionCells (= 12.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 12.0.0)
-    - MaterialComponents/Collections (= 12.0.0)
-    - MaterialComponents/FlexibleHeader (= 12.0.0)
-    - MaterialComponents/FontDiskLoader (= 12.0.0)
-    - MaterialComponents/HeaderStackView (= 12.0.0)
-    - MaterialComponents/Ink (= 12.0.0)
-    - MaterialComponents/NavigationBar (= 12.0.0)
-    - MaterialComponents/OverlayWindow (= 12.0.0)
-    - MaterialComponents/PageControl (= 12.0.0)
-    - MaterialComponents/Palettes (= 12.0.0)
-    - MaterialComponents/private (= 12.0.0)
-    - MaterialComponents/RobotoFontLoader (= 12.0.0)
-    - MaterialComponents/ShadowElevations (= 12.0.0)
-    - MaterialComponents/ShadowLayer (= 12.0.0)
-    - MaterialComponents/Slider (= 12.0.0)
-    - MaterialComponents/Snackbar (= 12.0.0)
-    - MaterialComponents/SpritedAnimationView (= 12.0.0)
-    - MaterialComponents/Switch (= 12.0.0)
-    - MaterialComponents/Typography (= 12.0.0)
-  - MaterialComponents/ActivityIndicator (12.0.0)
-  - MaterialComponents/AppBar (12.0.0):
+  - MaterialComponents (12.0.1):
+    - MaterialComponents/ActivityIndicator (= 12.0.1)
+    - MaterialComponents/AppBar (= 12.0.1)
+    - MaterialComponents/ButtonBar (= 12.0.1)
+    - MaterialComponents/Buttons (= 12.0.1)
+    - MaterialComponents/CollectionCells (= 12.0.1)
+    - MaterialComponents/CollectionLayoutAttributes (= 12.0.1)
+    - MaterialComponents/Collections (= 12.0.1)
+    - MaterialComponents/FlexibleHeader (= 12.0.1)
+    - MaterialComponents/FontDiskLoader (= 12.0.1)
+    - MaterialComponents/HeaderStackView (= 12.0.1)
+    - MaterialComponents/Ink (= 12.0.1)
+    - MaterialComponents/NavigationBar (= 12.0.1)
+    - MaterialComponents/OverlayWindow (= 12.0.1)
+    - MaterialComponents/PageControl (= 12.0.1)
+    - MaterialComponents/Palettes (= 12.0.1)
+    - MaterialComponents/private (= 12.0.1)
+    - MaterialComponents/RobotoFontLoader (= 12.0.1)
+    - MaterialComponents/ShadowElevations (= 12.0.1)
+    - MaterialComponents/ShadowLayer (= 12.0.1)
+    - MaterialComponents/Slider (= 12.0.1)
+    - MaterialComponents/Snackbar (= 12.0.1)
+    - MaterialComponents/SpritedAnimationView (= 12.0.1)
+    - MaterialComponents/Switch (= 12.0.1)
+    - MaterialComponents/Typography (= 12.0.1)
+  - MaterialComponents/ActivityIndicator (12.0.1)
+  - MaterialComponents/AppBar (12.0.1):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -34,15 +34,15 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (12.0.0):
+  - MaterialComponents/ButtonBar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (12.0.0):
+  - MaterialComponents/Buttons (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionCells (12.0.0):
+  - MaterialComponents/CollectionCells (12.0.1):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -53,81 +53,81 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (12.0.0)
-  - MaterialComponents/Collections (12.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (12.0.1)
+  - MaterialComponents/Collections (12.0.1):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/FlexibleHeader (12.0.0)
-  - MaterialComponents/FontDiskLoader (12.0.0)
-  - MaterialComponents/HeaderStackView (12.0.0)
-  - MaterialComponents/Ink (12.0.0)
-  - MaterialComponents/NavigationBar (12.0.0):
+  - MaterialComponents/FlexibleHeader (12.0.1)
+  - MaterialComponents/FontDiskLoader (12.0.1)
+  - MaterialComponents/HeaderStackView (12.0.1)
+  - MaterialComponents/Ink (12.0.1)
+  - MaterialComponents/NavigationBar (12.0.1):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (12.0.0)
-  - MaterialComponents/PageControl (12.0.0)
-  - MaterialComponents/Palettes (12.0.0)
-  - MaterialComponents/private (12.0.0):
-    - MaterialComponents/private/Color (= 12.0.0)
-    - MaterialComponents/private/Icons (= 12.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 12.0.0)
-    - MaterialComponents/private/Overlay (= 12.0.0)
-    - MaterialComponents/private/RTL (= 12.0.0)
-    - MaterialComponents/private/ThumbTrack (= 12.0.0)
-  - MaterialComponents/private/Color (12.0.0)
-  - MaterialComponents/private/Icons (12.0.0):
-    - MaterialComponents/private/Icons/Base (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 12.0.0)
-  - MaterialComponents/private/Icons/Base (12.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (12.0.0):
+  - MaterialComponents/OverlayWindow (12.0.1)
+  - MaterialComponents/PageControl (12.0.1)
+  - MaterialComponents/Palettes (12.0.1)
+  - MaterialComponents/private (12.0.1):
+    - MaterialComponents/private/Color (= 12.0.1)
+    - MaterialComponents/private/Icons (= 12.0.1)
+    - MaterialComponents/private/KeyboardWatcher (= 12.0.1)
+    - MaterialComponents/private/Overlay (= 12.0.1)
+    - MaterialComponents/private/RTL (= 12.0.1)
+    - MaterialComponents/private/ThumbTrack (= 12.0.1)
+  - MaterialComponents/private/Color (12.0.1)
+  - MaterialComponents/private/Icons (12.0.1):
+    - MaterialComponents/private/Icons/Base (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_check_circle (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_info (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 12.0.1)
+    - MaterialComponents/private/Icons/ic_reorder (= 12.0.1)
+  - MaterialComponents/private/Icons/Base (12.0.1)
+  - MaterialComponents/private/Icons/ic_arrow_back (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (12.0.0):
+  - MaterialComponents/private/Icons/ic_check (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (12.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (12.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (12.0.0):
+  - MaterialComponents/private/Icons/ic_info (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (12.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (12.0.1):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (12.0.0)
-  - MaterialComponents/private/Overlay (12.0.0)
-  - MaterialComponents/private/RTL (12.0.0)
-  - MaterialComponents/private/ThumbTrack (12.0.0):
+  - MaterialComponents/private/KeyboardWatcher (12.0.1)
+  - MaterialComponents/private/Overlay (12.0.1)
+  - MaterialComponents/private/RTL (12.0.1)
+  - MaterialComponents/private/ThumbTrack (12.0.1):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/RobotoFontLoader (12.0.0):
+  - MaterialComponents/RobotoFontLoader (12.0.1):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (12.0.0)
-  - MaterialComponents/ShadowLayer (12.0.0)
-  - MaterialComponents/Slider (12.0.0):
+  - MaterialComponents/ShadowElevations (12.0.1)
+  - MaterialComponents/ShadowLayer (12.0.1)
+  - MaterialComponents/Slider (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (12.0.0):
+  - MaterialComponents/Snackbar (12.0.1):
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (12.0.0)
-  - MaterialComponents/Switch (12.0.0):
+  - MaterialComponents/SpritedAnimationView (12.0.1)
+  - MaterialComponents/Switch (12.0.1):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (12.0.0)
+  - MaterialComponents/Typography (12.0.1)
 
 DEPENDENCIES:
   - MaterialComponents (from `../../`)
@@ -137,8 +137,8 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  MaterialComponents: da64cae6db6bef2d7d1c80e10a3c71a18b07bb76
+  MaterialComponents: c9194c49be10b8ac59cb8f857bedecbb511705a8
 
 PODFILE CHECKSUM: b585ca32a2884e050823cc1f861e8b7246f7dcc1
 
-COCOAPODS: 1.0.0
+COCOAPODS: 1.0.1
diff --git a/demos/Shrine/Shrine.xcodeproj/project.pbxproj b/demos/Shrine/Shrine.xcodeproj/project.pbxproj
index c6e6dfe6268..f4983fc7f5a 100644
--- a/demos/Shrine/Shrine.xcodeproj/project.pbxproj
+++ b/demos/Shrine/Shrine.xcodeproj/project.pbxproj
@@ -134,12 +134,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = DE5D2A561C81068100C9C650 /* Build configuration list for PBXNativeTarget "Shrine" */;
 			buildPhases = (
-				BD04A4A94E7A074ACE45ED21 /* 📦 Check Pods Manifest.lock */,
+				BD04A4A94E7A074ACE45ED21 /* [CP] Check Pods Manifest.lock */,
 				DE5D2A401C81068100C9C650 /* Sources */,
 				DE5D2A411C81068100C9C650 /* Frameworks */,
 				DE5D2A421C81068100C9C650 /* Resources */,
-				D1F846F8DE8314F37D7BCFC1 /* 📦 Embed Pods Frameworks */,
-				E79A83FFB3D723D88B7FB762 /* 📦 Copy Pods Resources */,
+				D1F846F8DE8314F37D7BCFC1 /* [CP] Embed Pods Frameworks */,
+				E79A83FFB3D723D88B7FB762 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -199,14 +199,14 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		BD04A4A94E7A074ACE45ED21 /* 📦 Check Pods Manifest.lock */ = {
+		BD04A4A94E7A074ACE45ED21 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Check Pods Manifest.lock";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -214,14 +214,14 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		D1F846F8DE8314F37D7BCFC1 /* 📦 Embed Pods Frameworks */ = {
+		D1F846F8DE8314F37D7BCFC1 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Embed Pods Frameworks";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -229,14 +229,14 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Shrine/Pods-Shrine-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E79A83FFB3D723D88B7FB762 /* 📦 Copy Pods Resources */ = {
+		E79A83FFB3D723D88B7FB762 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "📦 Copy Pods Resources";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/scripts/external/arc-xcode-test-engine b/scripts/external/arc-xcode-test-engine
index 4ab1f790ccc..bc4b6d70255 160000
--- a/scripts/external/arc-xcode-test-engine
+++ b/scripts/external/arc-xcode-test-engine
@@ -1 +1 @@
-Subproject commit 4ab1f790ccc3f2ab62b5a66d8a183b2a59dec79e
+Subproject commit bc4b6d7025530dc51cdb9ca9c863071373a1c1a1