Merge "Do not reset roundness on ExpandableOutlineView.initDimens()" into tm-qpr-dev