Merge "Use correct config.smallestScreenWidthDp when creating Resource in DeviceProfile" into tm-dev