Merge "Make activity masking functions static"