Merge "Register broadcast receiver at runtime instead" into pi-dev