[WIP] Fix issues in light integration#5

Copilot wants to merge 1 commit intolight-integrationpremsantosh/Friday:light-integrationfrom

copilot/sub-pr-4premsantosh/Friday:copilot/sub-pr-4Copy head branch name to clipboard