* commit '1ba310ca02eeba9281c244851e27f4fbbf3c81d6': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]