Issue #2161411: Ensure that demo content apps are properly enabled on install if selected