Merge "no layout = no visibility" into klp-dev