Merge "[automerger skipped] Merge "Move PublicFormat definition to libui" am: 8768bea03b am: d0488e2b7d am: 30fa7ccbba -s ours am skip reason: change_id I49eea4325cde244a7168c6954027ee5c9a8459da with SHA1 63f5f927fc is in history"