Merge "Switched to round rect clipping while appearing notifications" into mnc-dev