Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev