Merge "file_contexts: Add support for upstream console device"