Merge "Update accessibility settings layout" into sc-dev