Merge "Fixing issue where we were unnecessarily center pages vertically (Bug: 5521605)" into ics-mr1