Merge "Fix phone mode task bar inset values not correctly initialized" into main