Merge "Unify clipping return value behavior - true if not empty" into mnc-dev