Merge "Update scrim during sensor event"