Merge "Fixing issue where smallest screen dim was not taking dpi into account." into ics-scoop