Merge "Add badging of Payment apps" into klp-dev