Merge "Add window layout affinity." into rvc-dev