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