Merge "Update portmapping on port state notification" into stable/silicon