Merge "Correct the docs for getUserBadgedIcon" into mnc-dev