Merge "Fixed the opened folder on taskbar when NotifShade is shown" into main