Merge "Update overscroll and toast UI" into oc-dr1-dev
am: 1c31f9653f

Change-Id: Ib76daf28d94791f0c525aa1dcc57939ac60050c9