Merge "Fix leak of InCallActivity's DecorView and stuck on disconnection bug."
am: e06977fa96

Change-Id: I2803e6c2570f22d56e207ce9730bedaa0b10a301