Merge "avoid crash in emptyBuffer when input buffer handle is invalid" into qt-dev am: e116345903 am: 671bc34173
am: a88303ec77

Change-Id: Id1957a6d48c41af3ce0233e5cca2447d4d81bb8e