They've said that in areas with enemies, even after you clear it, you won't be able to holster it at all anymore, due to "memory issues" with their new animations for melee and the combat roll. It will be holstered automatically when in hubs or areas where there are never enemies.