Merge "Update radius value to 2dp to fit AOSP design."