Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev