Merge "Always disable the clip for layers Bug #8149344" into klp-dev