Merge "Refactor BadgedImageView to extend FrameLayout"