Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev am: 0aadeed536
am: 76ec2380fc

Change-Id: I57f02269d107ab2a3f114a20b650a60dbe7db60b