Merge "Re-add default channel on app targetsdk downgrade." into oc-dev