Merge "Fix regression in swiping over rotation button." into pi-dev
am: 287d4327cd

Change-Id: I576b5ab4c537d9fb3f221c8e2bae0339c63b7d57