Simplify window, activity record, and layer names Test: N/A Change-Id: Ic7d4cfaf17f75eabf84fc1086b60eb56030432ec