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