Merge "Fix partial block translation for non-editing msg"