Merge "Adjust layout of Prevent Ringing" into sc-dev