Merge "Add support for resetting signal masks"