Merge "Fix to return BLOCKED_REASON_NONE for system uids" into main