Merge "Change screen pinning back to old gesture"