Merge "Set ro.sf.lcd_density" into pi-dev