Merge "[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure" into sc-v2-dev