Merge "API adjustments for Picture serialization discussion"