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

Change-Id: I21fe41861a98f87e035bce64c406040cb088b356