Merge "hwc: Reset FB Z order to -1 instead of 0"