Merge "hwc: Trim out of screen layers once only"