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

Change-Id: I1162e9ddb3a7af8f610a997ca71e6fe4b5057b7e