Merge "Keyboard shortcuts: minor Activity broadcast refactor"