Change screen pinning back to old gesture am: 4e723e6087
am: 6f0236688f  -s ours

Change-Id: Ic7820f41eeaf02de2c0ee8ed41f43103f5eb3d14