Merge change 20004

* changes:
  Another tweak for text wrap screen. We add a fixed padding when wrapping text around the screen width. If the block already has a padding, we should put it under consideration so that we won't add too much padding.