Merge "Surfaceflinger: rename PhaseOffsets to VsyncConfiguration"