Merge "Add file picker support to glass proto"