Few tweaks to media switching, remove unreliable canplay event