Merge "Fix issue #4554429: API REVIEW: deprecate Live Folders"