Merge "Add null check to getAppContentDescription" into mainline-prod