Merge "Fix colorized messaging layout and smart replies." into pi-dev