Merge "Not diagnosing taskbar as <Launcher in invalid state>" into main