Merge "Missing paddingRight added." into ub-now-lunchbox