Merge "Further activity masking changes:"