Merge "Updated EdgeEffect to respect accessibility settings" into sc-dev