Merge "Add bug fix flag for window decor SCVH caching" into main