Merge "Fix last notification trimmed on lockscreen" into tm-dev