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

Change-Id: I49fccc9953bc26febafe2b57cec5bc13c56f0c23