Merge "[8/n] FRR notification counter update" into udc-qpr-dev