Merge "Add sys-apis for dev-mode freeform support"