Merge "Wrap ViewGroup content in save/restore to protect composited children"