Merge "Fix an issue where if an app specified a height we wouldn't use it" into main