Merge "Add extra padding for decorated visual renderer" into devel/master