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

Change-Id: If30f10046c9b9952964e8656d0666c081e75c55f