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

Change-Id: I62af684babc2a3f444f1ba3b26ad70e6acfc238b