Merge "Change screen pinning back to old gesture" into nyc-mr2-dev am: 8812fb0695
am: 3b03622406  -s ours

Change-Id: I6dfdf86c11ef17a3cc2d09c7b68486452f5401cc