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

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