Merge "Fix missing frames during shade close" into main