Merge "Turn off picture splitting for now." into honeycomb