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

Change-Id: Id0158fe95811436fccda10bf270a2e8d550dcdec