Merge "Moving DisplayController to dagger" into main