Merge "Update overscroll and toast UI" into oc-dr1-dev