Merge "Add content description to keyguard user avatar" into mnc-dev