Merge "Add enforcement for unique displayarea id"