Merge "Tweak test for layout." into klp-dev