Merge "Log desktop mode changes to system event log." into main