Merge "Handle USER_ALL case when policy applied globally." into main