Merge "[logging] Correct Enter Desktop windowing by Screen On" into main