Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev