Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev