Merge "Fix clipping of notifications on lockscreen."