Merge "Refactored TaskbarInsetsController" into main