Merge "Minor cleanup to AgendaWindowAdapter. No functional change."