Merge "Avoid double-badging application icon in the dialog" into sc-dev