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

Change-Id: I328af6ee57082e8523fc3926d63e8ac568b2fa69