Merge "DO NOT MERGE: Fix sync issue with handling display state changes" into main