Merge "Extract widget sizes serialization and deserialization to util class and add unit test" into main