Merge "Revert "utils: prevent clear from occurring on HWC_BLIT layers""