Merge "Address a couple small followups for TaskbarInsetsController" into tm-dev