Merge "Fix system server crash when AvatarPickerActivity started without file authority" into main