Merge "Ensure test notification is properly announced" into marshmallow-cts-dev