Merge "Enable the rounded box ripple flag." into tm-qpr-dev