Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1