Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev