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

Change-Id: I0063c721222ed6899681a78ab70c17d178f118ff