Merge "packages/apps/Settings/ : added scaled hdpi version of assets that were moved to drawable-mdpi"