Merge "Add methods to get locked buffer from Surface." into main