[#3368] Better media editor UI