Merge "Add a Shade log buffer and lots of logging to QS expand touches" into tm-qpr-dev