libnslayout: branch master updated. 29c85a74a5fe16bfa6cba7d82e4748367e261a20