Merge "Update surface position once created." into pi-dev am: 8a4af9c3e8
am: 85602dae12

Change-Id: I184b4d9545b11498b891e7442c3b92b4b27a3b59