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

Change-Id: Ia0f4dc6193776e0b37eb7e2d2048918510cae535