Merge "hwc: move fbzorder initialization code to hwc_fbupdate.cpp"