Merge proposals dependent on lp://staging/~psivaa/cupstream2distro-config/mir-xenial-touch-nonfatal

1. mir-xenial-touch-nonfatal
2. Dependent merge proposals