Merge "Cleaned up ASurfaceControlTest" into sc-dev