Merge "Only buildLayer() on attached views" into klp-dev