Fix toolbar display on recent android versions