Merge "Remove Parsoid-specific padding and background"