Merge "Disable smart forwarding based on subid" into sc-qpr1-dev