Merge "Account for per-edge cutout for system gestures" into sc-qpr1-dev