Merge "Fix padding in management activities" into rvc-qpr-dev