Merge "Fix layout incompatibility between hdpi vs xhdpi devices"