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