Merge "Fix findMinWidthAndHeightDpForDevice so it finds the smallest dp height of the cached displays" into main