Merge "Tidy resources related to app branding."