Merge "Update all apps divider to pill shape" into sc-dev