Merge "Improve readability of ExpandableOutlineView.getClipPath()" into tm-qpr-dev