Merge "Clean up activity/application labels" into lmp-dev