Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL"