Merge "Fix sync issue with handling display state changes" into main