Merge "Allows multi-line message on small-screen devices" into klp-dev