Merge "Fix task bar unstashing and stashing when triggering back gesture using the trackpad" into udc-dev