Merge "Fix tapl test failures from enabling task bar on the phones" into main