Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
am: 0aadeed536

Change-Id: I88bf203f78319713f719fe2426c0c4a1e7770b11