Merge "Round rect clipping for notification contents" into mnc-dev