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

Change-Id: I71d10f6c9697f92ae0c04429fda48aab7d108d24