Merge "Annotate Activity.dump with nullability annotations"