Merge "Remove unused vars from LocalDisplayAdapter"