Merge "Simplify window, activity record, and layer names"