Merge "CE: Fix color layer HWC call ordering"