Merge "Correct nullability annotation in onActivityResult()" into main