Merge "QS Guest fixes" into lmp-dev