Merge "Fix crash in LocalDisplayAdapter"