Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev am: 2cf8f91637
am: 8a3dff0d86

Change-Id: Id19a8e567b0bfd197898fe264c3228551b5aec90