Merge "Fix bug where taskbar jumps when double swiping up." into tm-qpr-dev