fixes from ICS for scrolling. also hiding zero height row
Merge commit '9d3aeb2b53075dbe8ffd5beaa097337b521ca34a'