Merge "Fix wrong margin on widget conversation view"