Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev
am: 392ac74f37

Change-Id: I9105966db42cf5cc9f0748ddd9121806529a3dd3