Merge "Remove one more layer of view hierarchy."