Fix for #default_form when form does not exist

Change-Id: I8a8d25c0b37532da853237bd29c71a4ae03280a9
Merge "Fix for #default_form when form does not exist"