Merge "hwui : fix memory leak due to duplicate in shadow cache"