Merge "Update overview scrim color to system_neutral2_200" into tm-dev