Merge "gralloc: Fix UBWC related issues"