Merge "Revert "Layer: Use raw pointers for Current/Drawing parent""