Merge "Account for all apps offset during taskbar layout" into main