Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2