Merge "Fix bug #4796027 left/right padding regression after recent View change (part 2)"