Merge "Fixing NullPointerException in TaskbarUIController" into main