Merge "hwc: Add error check for secure layer handling"