Merge "Fix constant name for KEY_PICTURE_TYPE"