Merge "Don't use debug data in app list controller"