Merge "Fix regression in swiping over rotation button." into pi-dev