Merge "Add flag info to displays dump output proto"