Merge "Promote layout debugging code from GridLayout to ViewGroup."