Merge "Using clippath for adaptive icon drawable instead of bitmap shader" into tm-qpr-dev