Merge "Switch to SharedElementCallback to HardwareBuffer"