Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""