Make bypass-media-after-hold a media-option

FS-6186 --resolve

Thanks-to: Matteo Brancaleoni <mbrancaleoni@voismart.it>
whitespace cleanup