Merge "hwc: Set display as active only after unblanking it"