[automerger skipped] Merge "Don't crash if NSSL gets incomplete gesture" into...

[automerger skipped] Merge "Don't crash if NSSL gets incomplete gesture" into qt-qpr1-dev am: 025baaca -s ours am: 0732acfb -s ours am: da450c34 -s ours

am skip reason: Change-Id I22182d90b0057df67fbd6d20785da23d6c17dcf3 with SHA-1 c0e4c566 is in history

Change-Id: I51e53ce69a1e81330f2b9f32f9abeaf42b6a2112