Merge "Optimize layout rendering in layoutlib" into klp-dev