Merge "Fallback to endRelOffset for activity surface offsets" into 24D1-dev