Merge "hwc: Restrict scissor rect to view frame rect"