Merge "Don't send override buffer down to HWC if the layer would be skipped" into sc-dev