Merge "Enhancement on ICS data stall polling logic" into ics-mr1