Merge "Fixing overscroll getting lost due to float point comparision" into udc-dev