Merge "Update task bar icon alignment logic when launcher is paused and resumed in Overview" into tm-dev