Merge "Adding additional cases where we may have to recalculate the number of apps/widget pages. (Bug: 5475261)" into ics-mr0