Merge "Let InCallActivity handle resize config change." into nyc-dev