Merge "Remove ContentCaptureServerSession when app died." into qt-dev am: 094b9acb0d
am: 11c6dfd0af

Change-Id: I4963ae27992e59b801c51304a181093d2a1b9735