Merge "preload AppControl registry" into devel_3.0_main