Merge "Update liblayout" into klp-dev