Merge "Lock all of SurfaceFlinger::processDisplayAdded for kMainThreadContext instead of just a portion of it." into main