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

Change-Id: I4716da3060f2fac51fcb273b98d5e87d584e989f