Merge "Normalize HDPI and MDPI assets"