Merge "Swap default display when lid-switch is toggled."