Merge "Add tests for non-rectangular clipping" into lmp-mr1-dev