Merge "Fix badged apps in Privacy dialog"