Merge "Moving away from LocalIntentReceiver" into main