Merge "[Sound panel] Update Ui layout to match with mertial next" into sc-v2-dev