Merge "Improve wording of "size-bytes" and "size-pixel" messages"