Merge "Apply scale to boundsInParent"