Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev