Merge "Use max height attr as backup for device config" into tm-dev