Merge commit '0edddddd14708ccf1c98081edd09d3b9783ba08b' * commit '0edddddd14708ccf1c98081edd09d3b9783ba08b': Add internal support for screen size/ratio, and version qualifiers.
Merge commit '0edddddd14708ccf1c98081edd09d3b9783ba08b' * commit '0edddddd14708ccf1c98081edd09d3b9783ba08b': Add internal support for screen size/ratio, and version qualifiers.