Merge "Compare min width/height with the longest screen side" into sc-dev