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

Change-Id: I206f0394e523c69bf74df51ad4b9779020714626