Merge "Change saveOnAllViewsInsible from boolean to flags" into oc-dev