Merge "Set initial value of enabledDisplay to DEFAULT_DISPLAY" into main