Merge "Add test for display configuration listener"