Merge "Pass a bg handler when registering broadcast receiver" into main