Merge "Fix enter desktop transition flicker in BD2A build" into main