Merge "Remove old activity masking code."