Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8
am: 9561558259

Change-Id: I866e47039f300e3064e3baf8818aa3426385c927