Merge "Prevent sending early termination of appop use" into qt-dev am: c19818819e am: c866e0c52e

Change-Id: Id365bf789c51e4cb463151107a19f50393a6ae40