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