Merge "Add support for TARGET_SCREEN_DENSITY"