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

* commit 'fa4656a60b6a9e2f9b21a575c11a1d5c6e6771fc':
  Adding additional cases where we may have to recalculate the number of apps/widget pages. (Bug: 5475261)