Merge "Move SIP broadcast receiver to dynamic registration"