Merge "Make it harder for apps to mess up ViewGroup's internal state Bug #6421288" into jb-dev