Merge "Change ForcedResizableInfoActivity to handle config. changes" into nyc-dev