Merge "Fix incorrect colored bar when task bar is hidden" into tm-dev