Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev