Merge Padding fix properly in master branch.

Padding fix was mixed with an update of msm_fb, that led to the blinking when using it.

First part of merge from JB to CM is to port only the padding fix first.

Updating msm fb should come later