Merge "Fix surface frame size reporting." into honeycomb