Merge "Fixed that the bigtext nofitication had slightly different padding" into nyc-dev