Merge "camera metadata: Add support for session parameter keys"